Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUG] 1965 Split up embedding functions - Redux #2395

Merged
merged 2 commits into from
Jun 21, 2024
Merged

[BUG] 1965 Split up embedding functions - Redux #2395

merged 2 commits into from
Jun 21, 2024

Conversation

atroyn
Copy link
Contributor

@atroyn atroyn commented Jun 21, 2024 •
edited
Loading

Description of changes

The original attempt to split up the embedding functions failed because of python 3.9 and 3.10 incompatibilities with issubtype.

Original PR here: #2034

Failing tests here: https:/chroma-core/chroma/actions/runs/9605053108/job/26491923410

The fix is changing issubtype to isinstance, which has the same functionality.

Test plan

Along with CI, tested locally with python 3.9 and 3.10 and confirmed passing.

Documentation Changes

N/A

@github-actions GitHub Actions
Copy link

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

@atroyn atroyn marked this pull request as ready for review June 21, 2024 01:34
@atroyn atroyn changed the title [ENH] 1965 Split up embedding functions - Redux [BUG] 1965 Split up embedding functions - Redux Jun 21, 2024
atroyn
atroyn commented Jun 21, 2024
View reviewed changes
chromadb/utils/embedding_functions/__init__.py
attr = getattr(module, attr_name)
if (
isinstance(attr, type)
and isinstance(attr, EmbeddingFunction)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only change from #2034

@atroyn atroyn enabled auto-merge (squash) June 21, 2024 01:41
@atroyn atroyn merged commit dd56ded into main Jun 21, 2024
65 checks passed
Anush008 pushed a commit to Anush008/chroma that referenced this pull request Jun 27, 2024
@atroyn @Anush008
[BUG] 1965 Split up embedding functions - Redux (chroma-core#2395)
0814b40 
## Description of changes
The original attempt to split up the embedding functions failed because
of python 3.9 and 3.10 incompatibilities with `issubtype`.

Original PR here: chroma-core#2034

Failing tests here:
https:/chroma-core/chroma/actions/runs/9605053108/job/26491923410

The fix is changing `issubtype` to `isinstance`, which has the same
functionality.

## Test plan

Along with CI, tested locally with python 3.9 and 3.10 and confirmed
passing.

## Documentation Changes
N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@atroyn