introduce instance mappings #132

danyilq · 2023-07-31T08:50:30Z

Please check if the PR fulfills these requirements

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes/features)
Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Introduces new class MarqoInstanceMappings that allows user to specify url for each index to use for index-specific api requests. Moves certain methods from Client class to Index class and deprecates those used in Client
What is the current behavior? (You can also link to an open issue here)
What is the new behavior (if this is a feature change)?
Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)
Other information:

src/marqo/client.py

src/marqo/_httprequests.py

src/marqo/instance_mappings.py

pandu-k

We need tests to ensure all the new index-level endpoints work:
Index.get_loaded_models(), etc.
Feel free to copy/paste/modify the existing tests to make this faster

src/marqo/marqo_cloud_instance_mappings.py

tests/v0_tests/test_marqo_cloud_instance_mapping.py

src/marqo/marqo_cloud_instance_mappings.py

danyilq · 2023-08-02T05:56:58Z

We need tests to ensure all the new index-level endpoints work: Index.get_loaded_models(), etc. Feel free to copy/paste/modify the existing tests to make this faster

@pandu-k Those are already implemented as tests and were tested they work correctly both on V2 on local setup

src/marqo/client.py

src/marqo/index.py

src/marqo/instance_mappings.py

tests/marqo_test.py

tests/v0_tests/test_add_documents.py

tests/marqo_test.py

tests/v0_tests/test_index.py

tests/v0_tests/test_marqo_cloud_instance_mapping.py

src/marqo/cloud_helpers.py

src/marqo/index.py

tests/v0_tests/test_index.py

tests/v0_tests/test_sentence_chunking.py

tox.ini

tests/v0_tests/test_telemetry.py

tests/v0_tests/test_tensor_search.py

src/marqo/cloud_helpers.py

tox.ini

tests/marqo_test.py

tests/scripts/create_test_suffix.py

tests/scripts/delete_all_indexes.py

tests/scripts/run_cloud_tests.py

tests/v0_tests/test_client.py

pyproject.toml

tests/marqo_test.py

introduce instance mappings

8c08fed

pandu-k reviewed Jul 31, 2023

View reviewed changes

src/marqo/client.py Outdated Show resolved Hide resolved

farshidz and others added 7 commits August 1, 2023 00:39

Implement InstanceMappings and default and cloud implementations

ead493b

Remove index name from control url method

97489cd

Update httprequests module to use InstanceMappings

705082e

Fix class name

24a06d1

fix minimum version check and add cloud error

e83f0fe

delete enrich and improve error message

9fca70b

fix existing and add new tests

661d440

farshidz reviewed Aug 2, 2023

View reviewed changes

src/marqo/client.py Outdated Show resolved Hide resolved

src/marqo/client.py Show resolved Hide resolved

src/marqo/client.py Outdated Show resolved Hide resolved

farshidz requested changes Aug 2, 2023

View reviewed changes

src/marqo/client.py Outdated Show resolved Hide resolved

pandu-k reviewed Aug 2, 2023

View reviewed changes

src/marqo/_httprequests.py Outdated Show resolved Hide resolved

pandu-k reviewed Aug 2, 2023

View reviewed changes

src/marqo/instance_mappings.py Show resolved Hide resolved

src/marqo/instance_mappings.py Outdated Show resolved Hide resolved

Add docstring for InstanceMappings

8ee578f

pandu-k reviewed Aug 2, 2023

View reviewed changes

src/marqo/marqo_cloud_instance_mappings.py Outdated Show resolved Hide resolved

tests/v0_tests/test_marqo_cloud_instance_mapping.py Outdated Show resolved Hide resolved

src/marqo/marqo_cloud_instance_mappings.py Outdated Show resolved Hide resolved

danyilq added 3 commits August 2, 2023 09:52

move version_check and refactor

c26885c

refactor tests to work with cloud

a4d93e2

add readiness check for index that we want to clean documents in

acc162e

pandu-k reviewed Aug 3, 2023

View reviewed changes

danyilq added 2 commits August 3, 2023 08:08

unsupported operation + change hardcoded url for refresh_urls

fb766fa

adapt tests behaviour for cloud and partially refactor code

e7f514d

danyilq had a problem deploying to py-marqo-test-suite August 3, 2023 23:26 — with GitHub Actions Failure

pandu-k reviewed Aug 4, 2023

View reviewed changes

post debug changes to tests and new run env in tox

7b2491c

danyilq temporarily deployed to py-marqo-test-suite August 6, 2023 23:59 — with GitHub Actions Inactive

update logging for wait_for_index_status

c6f57cd

danyilq temporarily deployed to py-marqo-test-suite August 7, 2023 00:13 — with GitHub Actions Inactive

pandu-k reviewed Aug 7, 2023

View reviewed changes

improve test

32fc98a

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 07:15 — with GitHub Actions Inactive

pandu-k reviewed Aug 8, 2023

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

tests/marqo_test.py Outdated Show resolved Hide resolved

consistent hash

b56e53e

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 08:04 — with GitHub Actions Inactive

consistent hash

89c1fb8

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 08:13 — with GitHub Actions Inactive

pandu-k previously approved these changes Aug 8, 2023

View reviewed changes

better namings

0472dff

danyilq dismissed pandu-k’s stale review via 0472dff August 8, 2023 08:31

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 08:33 — with GitHub Actions Inactive

pandu-k previously approved these changes Aug 8, 2023

View reviewed changes

farshidz previously approved these changes Aug 8, 2023

View reviewed changes

bump pymarqo version

a711a95

danyilq dismissed stale reviews from farshidz and pandu-k via a711a95 August 8, 2023 09:26

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 09:28 — with GitHub Actions Inactive

adapt to 32 characters index name limit

836b4b7

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 10:39 — with GitHub Actions Inactive

pandu-k reviewed Aug 8, 2023

View reviewed changes

tests/marqo_test.py Outdated Show resolved Hide resolved

reduce test_demos.py index name length

e7b381b

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 12:09 — with GitHub Actions Inactive

raise error if index_name is too long

53db2d3

pandu-k previously approved these changes Aug 8, 2023

View reviewed changes

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 12:12 — with GitHub Actions Inactive

update version

2be58c2

danyilq dismissed pandu-k’s stale review via 2be58c2 August 8, 2023 12:14

pandu-k approved these changes Aug 8, 2023

View reviewed changes

danyilq temporarily deployed to py-marqo-test-suite August 8, 2023 12:16 — with GitHub Actions Inactive

danyilq merged commit 8b7e172 into mainline Aug 9, 2023
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

introduce instance mappings #132

introduce instance mappings #132

danyilq commented Jul 31, 2023 •

edited

Loading

pandu-k left a comment

danyilq commented Aug 2, 2023 •

edited

Loading

introduce instance mappings #132

introduce instance mappings #132

Conversation

danyilq commented Jul 31, 2023 • edited Loading

pandu-k left a comment

Choose a reason for hiding this comment

danyilq commented Aug 2, 2023 • edited Loading

danyilq commented Jul 31, 2023 •

edited

Loading

danyilq commented Aug 2, 2023 •

edited

Loading