feat: Adding packages for Milvus Online Store (feast-dev#4854)

Signed-off-by: Francisco Javier Arceo <[email protected]>
nishantgaurav-dev · Jan 15, 2025 · 39cf6ee · 39cf6ee
1 parent 8a1cbfa
commit 39cf6ee
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 0 deletions.
diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt
@@ -510,8 +510,14 @@ marshmallow==3.23.2
     #   great-expectations
 =======
 marshmallow==3.23.1
+<<<<<<< HEAD
     # via great-expectations
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+    # via
+    #   environs
+    #   great-expectations
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 matplotlib-inline==0.1.7
     # via
     #   ipykernel
@@ -520,7 +526,11 @@ mdurl==0.1.2
     # via markdown-it-py
 milvus-lite==2.4.10
     # via pymilvus
+<<<<<<< HEAD
 minio==7.2.11
+=======
+minio==7.1.0
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via feast (setup.py)
 mistune==3.0.2
     # via
@@ -735,12 +745,16 @@ pybindgen==0.22.1
 pycparser==2.22
     # via cffi
 <<<<<<< HEAD
+<<<<<<< HEAD
 pycryptodome==3.21.0
     # via minio
 pydantic==2.10.4
 =======
 pydantic==2.10.1
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+pydantic==2.10.2
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via
     #   feast (setup.py)
     #   fastapi
@@ -770,10 +784,15 @@ pyjwt[crypto]==2.10.0
     #   singlestoredb
     #   snowflake-connector-python
 <<<<<<< HEAD
+<<<<<<< HEAD
 pymilvus==2.4.9
     # via feast (setup.py)
 =======
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+pymilvus==2.4.9
+    # via feast (setup.py)
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 pymssql==2.3.2
     # via feast (setup.py)
 pymysql==1.1.1
@@ -836,7 +855,11 @@ python-dotenv==1.0.1
     # via
     #   environs
     #   uvicorn
+<<<<<<< HEAD
 python-json-logger==3.2.1
+=======
+python-json-logger==2.0.7
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via jupyter-events
 python-keycloak==4.2.2
     # via feast (setup.py)

diff --git a/sdk/python/requirements/py3.10-requirements.txt b/sdk/python/requirements/py3.10-requirements.txt
@@ -108,6 +108,7 @@ pyarrow==18.0.0
     #   feast (setup.py)
     #   dask-expr
 <<<<<<< HEAD
+<<<<<<< HEAD
 pydantic==2.10.4
     # via
     #   feast (setup.py)
@@ -119,6 +120,9 @@ pygments==2.18.0
 pyjwt==2.10.1
 =======
 pydantic==2.10.1
+=======
+pydantic==2.10.2
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via
     #   feast (setup.py)
     #   fastapi

diff --git a/sdk/python/requirements/py3.11-ci-requirements.txt b/sdk/python/requirements/py3.11-ci-requirements.txt
@@ -501,8 +501,14 @@ marshmallow==3.23.2
     #   great-expectations
 =======
 marshmallow==3.23.1
+<<<<<<< HEAD
     # via great-expectations
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+    # via
+    #   environs
+    #   great-expectations
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 matplotlib-inline==0.1.7
     # via
     #   ipykernel
@@ -511,7 +517,11 @@ mdurl==0.1.2
     # via markdown-it-py
 milvus-lite==2.4.10
     # via pymilvus
+<<<<<<< HEAD
 minio==7.2.11
+=======
+minio==7.1.0
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via feast (setup.py)
 mistune==3.0.2
     # via
@@ -726,12 +736,16 @@ pybindgen==0.22.1
 pycparser==2.22
     # via cffi
 <<<<<<< HEAD
+<<<<<<< HEAD
 pycryptodome==3.21.0
     # via minio
 pydantic==2.10.4
 =======
 pydantic==2.10.1
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+pydantic==2.10.2
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via
     #   feast (setup.py)
     #   fastapi
@@ -761,10 +775,15 @@ pyjwt[crypto]==2.10.0
     #   singlestoredb
     #   snowflake-connector-python
 <<<<<<< HEAD
+<<<<<<< HEAD
 pymilvus==2.4.9
     # via feast (setup.py)
 =======
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+pymilvus==2.4.9
+    # via feast (setup.py)
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 pymssql==2.3.2
     # via feast (setup.py)
 pymysql==1.1.1
@@ -827,7 +846,11 @@ python-dotenv==1.0.1
     # via
     #   environs
     #   uvicorn
+<<<<<<< HEAD
 python-json-logger==3.2.1
+=======
+python-json-logger==2.0.7
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via jupyter-events
 python-keycloak==4.2.2
     # via feast (setup.py)

diff --git a/sdk/python/requirements/py3.11-requirements.txt b/sdk/python/requirements/py3.11-requirements.txt
@@ -106,6 +106,7 @@ pyarrow==18.0.0
     #   feast (setup.py)
     #   dask-expr
 <<<<<<< HEAD
+<<<<<<< HEAD
 pydantic==2.10.4
     # via
     #   feast (setup.py)
@@ -117,6 +118,9 @@ pygments==2.18.0
 pyjwt==2.10.1
 =======
 pydantic==2.10.1
+=======
+pydantic==2.10.2
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via
     #   feast (setup.py)
     #   fastapi

diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt
@@ -511,8 +511,14 @@ marshmallow==3.23.2
     #   great-expectations
 =======
 marshmallow==3.23.1
+<<<<<<< HEAD
     # via great-expectations
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+    # via
+    #   environs
+    #   great-expectations
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 matplotlib-inline==0.1.7
     # via
     #   ipykernel
@@ -521,7 +527,11 @@ mdurl==0.1.2
     # via markdown-it-py
 milvus-lite==2.4.10
     # via pymilvus
+<<<<<<< HEAD
 minio==7.2.11
+=======
+minio==7.1.0
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via feast (setup.py)
 mistune==3.0.2
     # via
@@ -735,12 +745,16 @@ pybindgen==0.22.1
 pycparser==2.22
     # via cffi
 <<<<<<< HEAD
+<<<<<<< HEAD
 pycryptodome==3.21.0
     # via minio
 pydantic==2.10.4
 =======
 pydantic==2.10.1
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+pydantic==2.10.2
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via
     #   feast (setup.py)
     #   fastapi
@@ -770,10 +784,15 @@ pyjwt[crypto]==2.10.0
     #   singlestoredb
     #   snowflake-connector-python
 <<<<<<< HEAD
+<<<<<<< HEAD
 pymilvus==2.4.9
     # via feast (setup.py)
 =======
 >>>>>>> 26647afaa (chore: Update packages and fix lint issues (#4790))
+=======
+pymilvus==2.4.9
+    # via feast (setup.py)
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 pymssql==2.3.2
     # via feast (setup.py)
 pymysql==1.1.1
@@ -836,7 +855,11 @@ python-dotenv==1.0.1
     # via
     #   environs
     #   uvicorn
+<<<<<<< HEAD
 python-json-logger==3.2.1
+=======
+python-json-logger==2.0.7
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via jupyter-events
 python-keycloak==4.2.2
     # via feast (setup.py)

diff --git a/sdk/python/requirements/py3.9-requirements.txt b/sdk/python/requirements/py3.9-requirements.txt
@@ -102,6 +102,7 @@ pyarrow==18.0.0
     #   feast (setup.py)
     #   dask-expr
 <<<<<<< HEAD
+<<<<<<< HEAD
 pydantic==2.10.4
     # via
     #   feast (setup.py)
@@ -113,6 +114,9 @@ pygments==2.18.0
 pyjwt==2.10.1
 =======
 pydantic==2.10.1
+=======
+pydantic==2.10.2
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     # via
     #   feast (setup.py)
     #   fastapi

diff --git a/sdk/python/tests/integration/feature_repos/universal/online_store/milvus.py b/sdk/python/tests/integration/feature_repos/universal/online_store/milvus.py
@@ -1,8 +1,12 @@
 from typing import Any, Dict
 
+<<<<<<< HEAD
 import docker
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_for_logs
+=======
+from testcontainers.milvus import MilvusContainer
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 
 from tests.integration.feature_repos.universal.online_store_creator import (
     OnlineStoreCreator,
@@ -13,19 +17,28 @@ class MilvusOnlineStoreCreator(OnlineStoreCreator):
     def __init__(self, project_name: str, **kwargs):
         super().__init__(project_name)
         self.fixed_port = 19530
+<<<<<<< HEAD
         self.container = DockerContainer("milvusdb/milvus:v2.4.4").with_exposed_ports(
             self.fixed_port
         )
         self.client = docker.from_env()
+=======
+        self.container = MilvusContainer("milvusdb/milvus:v2.4.4").with_exposed_ports(
+            self.fixed_port
+        )
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 
     def create_online_store(self) -> Dict[str, Any]:
         self.container.start()
         # Wait for Milvus server to be ready
+<<<<<<< HEAD
         # log_string_to_wait_for = "Ready to accept connections"
         log_string_to_wait_for = ""
         wait_for_logs(
             container=self.container, predicate=log_string_to_wait_for, timeout=30
         )
+=======
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
         host = "localhost"
         port = self.container.get_exposed_port(self.fixed_port)
         return {

diff --git a/setup.py b/setup.py
@@ -156,11 +156,16 @@
 
 GO_REQUIRED = ["cffi~=1.15.0"]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 MILVUS_REQUIRED = ["pymilvus"]
 
 =======
 >>>>>>> 96da3d849 (feat: Update the go feature server from Expedia code repo. (#4665))
+=======
+MILVUS_REQUIRED = ["pymilvus"]
+
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
 CI_REQUIRED = (
     [
         "build",
@@ -368,10 +373,14 @@ def run(self):
         "faiss": FAISS_REQUIRED,
         "qdrant": QDRANT_REQUIRED,
         "go": GO_REQUIRED,
+<<<<<<< HEAD
 <<<<<<< HEAD
         "milvus": MILVUS_REQUIRED,
 =======
 >>>>>>> 96da3d849 (feat: Update the go feature server from Expedia code repo. (#4665))
+=======
+        "milvus": MILVUS_REQUIRED,
+>>>>>>> 702a5fbb8 (feat: Adding packages for Milvus Online Store (#4854))
     },
     include_package_data=True,
     license="Apache",