From 0d569be2903ec73079e89debfcec720f4db19f91 Mon Sep 17 00:00:00 2001 From: HaoXuAI Date: Fri, 1 Nov 2024 19:19:20 -0700 Subject: [PATCH 1/6] feat: Refactor online store by removing the contrib directory Signed-off-by: HaoXuAI --- Makefile | 18 +++++----- .../adding-support-for-a-new-online-store.md | 2 +- docs/reference/online-stores/cassandra.md | 2 +- docs/reference/online-stores/elasticsearch.md | 2 +- docs/reference/online-stores/mysql.md | 2 +- docs/reference/online-stores/postgres.md | 2 +- docs/reference/online-stores/qdrant.md | 2 +- docs/reference/online-stores/scylladb.md | 2 +- sdk/python/docs/index.rst | 12 +++---- ..._stores.contrib.cassandra_online_store.rst | 4 +-- ..._stores.contrib.hazelcast_online_store.rst | 4 +-- ...line_stores.contrib.hbase_online_store.rst | 4 +-- ...online_stores.contrib.ikv_online_store.rst | 4 +-- ...line_stores.contrib.mysql_online_store.rst | 4 +-- .../feast.infra.online_stores.contrib.rst | 36 +++++++++---------- .../docs/source/feast.infra.online_stores.rst | 2 +- sdk/python/docs/source/index.rst | 12 +++---- .../cassandra_online_store/README.md | 0 .../__init__.py | 0 .../cassandra_online_store.py | 0 .../cassandra_repo_configuration.py | 0 .../__init__.py | 0 .../elasticsearch.py | 0 .../elasticsearch_repo_configuration.py | 0 .../{contrib => }/faiss_online_store.py | 0 .../hazelcast_online_store/README.md | 0 .../hazelcast_online_store/__init__.py | 0 .../hazelcast_online_store.py | 0 .../hazelcast_repo_configuration.py | 0 .../hbase_online_store/README.md | 0 .../hbase_online_store/__init__.py | 0 .../{contrib => }/hbase_online_store/hbase.py | 0 .../hbase_repo_configuration.py | 0 .../ikv_online_store/__init__.py | 0 .../{contrib => }/ikv_online_store/ikv.py | 0 .../mysql_online_store/README.md | 0 .../mysql_online_store/__init__.py | 0 .../{contrib => }/mysql_online_store/mysql.py | 0 .../mysql_repo_configuration.py | 0 .../infra/online_stores/postgres/__init__.py | 0 .../pgvector_repo_configuration.py | 0 .../{contrib => postgres}/postgres.py | 0 .../postgres_repo_configuration.py | 0 .../infra/online_stores/qdrant/__init__.py | 0 .../{contrib => qdrant}/qdrant.py | 0 .../qdrant_repo_configuration.py | 0 .../singlestore_online_store/singlestore.py | 0 .../singlestore_repo_configuration.py | 0 sdk/python/feast/repo_config.py | 18 +++++----- 49 files changed, 66 insertions(+), 66 deletions(-) rename sdk/python/feast/infra/online_stores/{contrib => }/cassandra_online_store/README.md (100%) rename sdk/python/feast/infra/online_stores/{contrib => cassandra_online_store}/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/cassandra_online_store/cassandra_online_store.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => cassandra_online_store}/cassandra_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{contrib/cassandra_online_store => elasticsearch}/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => elasticsearch}/elasticsearch.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => elasticsearch}/elasticsearch_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/faiss_online_store.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/hazelcast_online_store/README.md (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/hazelcast_online_store/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/hazelcast_online_store/hazelcast_online_store.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => hazelcast_online_store}/hazelcast_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/hbase_online_store/README.md (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/hbase_online_store/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/hbase_online_store/hbase.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => hbase_online_store}/hbase_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/ikv_online_store/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/ikv_online_store/ikv.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/mysql_online_store/README.md (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/mysql_online_store/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/mysql_online_store/mysql.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => mysql_online_store}/mysql_repo_configuration.py (100%) create mode 100644 sdk/python/feast/infra/online_stores/postgres/__init__.py rename sdk/python/feast/infra/online_stores/{contrib => postgres}/pgvector_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => postgres}/postgres.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => postgres}/postgres_repo_configuration.py (100%) create mode 100644 sdk/python/feast/infra/online_stores/qdrant/__init__.py rename sdk/python/feast/infra/online_stores/{contrib => qdrant}/qdrant.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => qdrant}/qdrant_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => }/singlestore_online_store/singlestore.py (100%) rename sdk/python/feast/infra/online_stores/{contrib => singlestore_online_store}/singlestore_repo_configuration.py (100%) diff --git a/Makefile b/Makefile index 30ac86e8919..1966d5a78c4 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,7 @@ test-python-universal-postgres-offline: test-python-universal-postgres-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.postgres_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.postgres_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.postgres \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -242,7 +242,7 @@ test-python-universal-postgres-online: test-python-universal-pgvector-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.pgvector_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.pgvector_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.postgres \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -261,7 +261,7 @@ test-python-universal-postgres-online: test-python-universal-mysql-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.mysql_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.mysql_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.mysql \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -280,14 +280,14 @@ test-python-universal-postgres-online: test-python-universal-cassandra: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.cassandra_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \ python -m pytest -x --integration \ sdk/python/tests test-python-universal-hazelcast: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.hazelcast_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.hazelcast_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.hazelcast \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -306,7 +306,7 @@ test-python-universal-hazelcast: test-python-universal-cassandra-no-cloud-providers: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.cassandra_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \ python -m pytest -x --integration \ -k "not test_lambda_materialization_consistency and \ @@ -323,7 +323,7 @@ test-python-universal-cassandra-no-cloud-providers: test-python-universal-elasticsearch-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.elasticsearch_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.elasticsearch_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.elasticsearch \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -342,7 +342,7 @@ test-python-universal-cassandra-no-cloud-providers: test-python-universal-singlestore-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.singlestore_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.singlestore_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.singlestore \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -353,7 +353,7 @@ test-python-universal-singlestore-online: test-python-universal-qdrant-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.qdrant_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.qdrant_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.qdrant \ python -m pytest -n 8 --integration \ -k "test_retrieve_online_documents" \ diff --git a/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md b/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md index 440205f8f11..5863818cc23 100644 --- a/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md +++ b/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md @@ -372,7 +372,7 @@ class RedisOnlineStoreCreator(OnlineStoreCreator): ```Makefile test-python-universal-cassandra: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.cassandra_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \ IS_TEST=True \ python -m pytest -x --integration \ diff --git a/docs/reference/online-stores/cassandra.md b/docs/reference/online-stores/cassandra.md index 61659ba7a2d..5a14ce8c56f 100644 --- a/docs/reference/online-stores/cassandra.md +++ b/docs/reference/online-stores/cassandra.md @@ -59,7 +59,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig). +The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig). For a full explanation of configuration options please look at file `sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md`. diff --git a/docs/reference/online-stores/elasticsearch.md b/docs/reference/online-stores/elasticsearch.md index bf6f9a58db1..33e447055ed 100644 --- a/docs/reference/online-stores/elasticsearch.md +++ b/docs/reference/online-stores/elasticsearch.md @@ -26,7 +26,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [ElasticsearchOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.elasticsearch.ElasticsearchOnlineStoreConfig). +The full set of configuration options is available in [ElasticsearchOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.elasticsearch.ElasticsearchOnlineStoreConfig). ## Functionality Matrix diff --git a/docs/reference/online-stores/mysql.md b/docs/reference/online-stores/mysql.md index cbc48457e13..3cacb2b1340 100644 --- a/docs/reference/online-stores/mysql.md +++ b/docs/reference/online-stores/mysql.md @@ -26,7 +26,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [MySQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.mysql.MySQLOnlineStoreConfig). +The full set of configuration options is available in [MySQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.mysql.MySQLOnlineStoreConfig). ## Functionality Matrix diff --git a/docs/reference/online-stores/postgres.md b/docs/reference/online-stores/postgres.md index e4e2173ccd7..278c382f639 100644 --- a/docs/reference/online-stores/postgres.md +++ b/docs/reference/online-stores/postgres.md @@ -35,7 +35,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [PostgreSQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStoreConfig). +The full set of configuration options is available in [PostgreSQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.postgres.PostgreSQLOnlineStoreConfig). ## Functionality Matrix diff --git a/docs/reference/online-stores/qdrant.md b/docs/reference/online-stores/qdrant.md index 66f4a59d24e..667e6844767 100644 --- a/docs/reference/online-stores/qdrant.md +++ b/docs/reference/online-stores/qdrant.md @@ -26,7 +26,7 @@ online_store: {% endcode %} -The full set of configuration options is available in [QdrantOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.qdrant.QdrantOnlineStoreConfig). +The full set of configuration options is available in [QdrantOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.qdrant.QdrantOnlineStoreConfig). ## Functionality Matrix diff --git a/docs/reference/online-stores/scylladb.md b/docs/reference/online-stores/scylladb.md index e28e810e214..c8583ac101a 100644 --- a/docs/reference/online-stores/scylladb.md +++ b/docs/reference/online-stores/scylladb.md @@ -55,7 +55,7 @@ online_store: {% endcode %} -The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig). +The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig). For a full explanation of configuration options please look at file `sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md`. diff --git a/sdk/python/docs/index.rst b/sdk/python/docs/index.rst index 86354f80c72..e8f6267a6bc 100644 --- a/sdk/python/docs/index.rst +++ b/sdk/python/docs/index.rst @@ -359,28 +359,28 @@ Snowflake Online Store PostgreSQL Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore +.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStore :members: -.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStoreConfig :members: HBase Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore +.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore :members: -.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStoreConfig :members: Cassandra Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore +.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore :members: -.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig :members: Batch Materialization Engine diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst index 3770cc8af70..e52318fd4f8 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst @@ -7,7 +7,7 @@ Submodules feast.infra.online\_stores.contrib.cassandra\_online\_store.cassandra\_online\_store module ------------------------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store +.. automodule:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store :members: :undoc-members: :show-inheritance: @@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.cassandra\_online\_store.cassandra\_online\_s Module contents --------------- -.. automodule:: feast.infra.online_stores.contrib.cassandra_online_store +.. automodule:: feast.infra.online_stores.cassandra_online_store :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst index bf3ed9d7d64..c50109a9769 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst @@ -7,7 +7,7 @@ Submodules feast.infra.online\_stores.contrib.hazelcast\_online\_store.hazelcast\_online\_store module ------------------------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store +.. automodule:: feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store :members: :undoc-members: :show-inheritance: @@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.hazelcast\_online\_store.hazelcast\_online\_s Module contents --------------- -.. automodule:: feast.infra.online_stores.contrib.hazelcast_online_store +.. automodule:: feast.infra.online_stores.hazelcast_online_store :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst index ce249023049..f4393116dad 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst @@ -7,7 +7,7 @@ Submodules feast.infra.online\_stores.contrib.hbase\_online\_store.hbase module -------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.hbase_online_store.hbase +.. automodule:: feast.infra.online_stores.hbase_online_store.hbase :members: :undoc-members: :show-inheritance: @@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.hbase\_online\_store.hbase module Module contents --------------- -.. automodule:: feast.infra.online_stores.contrib.hbase_online_store +.. automodule:: feast.infra.online_stores.hbase_online_store :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst index e7f858d1cf4..812e30932d5 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst @@ -7,7 +7,7 @@ Submodules feast.infra.online\_stores.contrib.ikv\_online\_store.ikv module ---------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.ikv_online_store.ikv +.. automodule:: feast.infra.online_stores.ikv_online_store.ikv :members: :undoc-members: :show-inheritance: @@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.ikv\_online\_store.ikv module Module contents --------------- -.. automodule:: feast.infra.online_stores.contrib.ikv_online_store +.. automodule:: feast.infra.online_stores.ikv_online_store :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst index 036922d658f..720a0f31833 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst @@ -7,7 +7,7 @@ Submodules feast.infra.online\_stores.contrib.mysql\_online\_store.mysql module -------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.mysql_online_store.mysql +.. automodule:: feast.infra.online_stores.mysql_online_store.mysql :members: :undoc-members: :show-inheritance: @@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.mysql\_online\_store.mysql module Module contents --------------- -.. automodule:: feast.infra.online_stores.contrib.mysql_online_store +.. automodule:: feast.infra.online_stores.mysql_online_store :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst index 2403b5b8d48..cf5e751c58c 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst @@ -7,11 +7,11 @@ Subpackages .. toctree:: :maxdepth: 4 - feast.infra.online_stores.contrib.cassandra_online_store - feast.infra.online_stores.contrib.hazelcast_online_store - feast.infra.online_stores.contrib.hbase_online_store - feast.infra.online_stores.contrib.ikv_online_store - feast.infra.online_stores.contrib.mysql_online_store + feast.infra.online_stores.cassandra_online_store + feast.infra.online_stores.hazelcast_online_store + feast.infra.online_stores.hbase_online_store + feast.infra.online_stores.ikv_online_store + feast.infra.online_stores.mysql_online_store Submodules ---------- @@ -19,7 +19,7 @@ Submodules feast.infra.online\_stores.contrib.cassandra\_repo\_configuration module ------------------------------------------------------------------------ -.. automodule:: feast.infra.online_stores.contrib.cassandra_repo_configuration +.. automodule:: feast.infra.online_stores.cassandra_repo_configuration :members: :undoc-members: :show-inheritance: @@ -27,7 +27,7 @@ feast.infra.online\_stores.contrib.cassandra\_repo\_configuration module feast.infra.online\_stores.contrib.elasticsearch module ------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.elasticsearch +.. automodule:: feast.infra.online_stores.elasticsearch :members: :undoc-members: :show-inheritance: @@ -35,7 +35,7 @@ feast.infra.online\_stores.contrib.elasticsearch module feast.infra.online\_stores.contrib.elasticsearch\_repo\_configuration module ---------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.elasticsearch_repo_configuration +.. automodule:: feast.infra.online_stores.elasticsearch_repo_configuration :members: :undoc-members: :show-inheritance: @@ -43,7 +43,7 @@ feast.infra.online\_stores.contrib.elasticsearch\_repo\_configuration module feast.infra.online\_stores.contrib.qdrant module ------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.qdrant +.. automodule:: feast.infra.online_stores.qdrant :members: :undoc-members: :show-inheritance: @@ -51,7 +51,7 @@ feast.infra.online\_stores.contrib.qdrant module feast.infra.online\_stores.contrib.qdrant\_repo\_configuration module ---------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.qdrant_repo_configuration +.. automodule:: feast.infra.online_stores.qdrant_repo_configuration :members: :undoc-members: :show-inheritance: @@ -59,7 +59,7 @@ feast.infra.online\_stores.contrib.qdrant\_repo\_configuration module feast.infra.online\_stores.contrib.hazelcast\_repo\_configuration module ------------------------------------------------------------------------ -.. automodule:: feast.infra.online_stores.contrib.hazelcast_repo_configuration +.. automodule:: feast.infra.online_stores.hazelcast_repo_configuration :members: :undoc-members: :show-inheritance: @@ -67,7 +67,7 @@ feast.infra.online\_stores.contrib.hazelcast\_repo\_configuration module feast.infra.online\_stores.contrib.hbase\_repo\_configuration module -------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.hbase_repo_configuration +.. automodule:: feast.infra.online_stores.hbase_repo_configuration :members: :undoc-members: :show-inheritance: @@ -75,7 +75,7 @@ feast.infra.online\_stores.contrib.hbase\_repo\_configuration module feast.infra.online\_stores.contrib.mysql\_repo\_configuration module -------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.mysql_repo_configuration +.. automodule:: feast.infra.online_stores.mysql_repo_configuration :members: :undoc-members: :show-inheritance: @@ -83,7 +83,7 @@ feast.infra.online\_stores.contrib.mysql\_repo\_configuration module feast.infra.online\_stores.contrib.pgvector\_repo\_configuration module ----------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.pgvector_repo_configuration +.. automodule:: feast.infra.online_stores.pgvector_repo_configuration :members: :undoc-members: :show-inheritance: @@ -91,7 +91,7 @@ feast.infra.online\_stores.contrib.pgvector\_repo\_configuration module feast.infra.online\_stores.contrib.postgres module -------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.postgres +.. automodule:: feast.infra.online_stores.postgres :members: :undoc-members: :show-inheritance: @@ -99,7 +99,7 @@ feast.infra.online\_stores.contrib.postgres module feast.infra.online\_stores.contrib.postgres\_repo\_configuration module ----------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.postgres_repo_configuration +.. automodule:: feast.infra.online_stores.postgres_repo_configuration :members: :undoc-members: :show-inheritance: @@ -107,7 +107,7 @@ feast.infra.online\_stores.contrib.postgres\_repo\_configuration module feast.infra.online\_stores.contrib.singlestore\_repo\_configuration module -------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.contrib.singlestore_repo_configuration +.. automodule:: feast.infra.online_stores.singlestore_repo_configuration :members: :undoc-members: :show-inheritance: @@ -115,7 +115,7 @@ feast.infra.online\_stores.contrib.singlestore\_repo\_configuration module Module contents --------------- -.. automodule:: feast.infra.online_stores.contrib +.. automodule:: feast.infra.online_stores :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.infra.online_stores.rst b/sdk/python/docs/source/feast.infra.online_stores.rst index 801d187a7c8..2ee19e241be 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.rst @@ -7,7 +7,7 @@ Subpackages .. toctree:: :maxdepth: 4 - feast.infra.online_stores.contrib + feast.infra.online_stores Submodules ---------- diff --git a/sdk/python/docs/source/index.rst b/sdk/python/docs/source/index.rst index 86354f80c72..e8f6267a6bc 100644 --- a/sdk/python/docs/source/index.rst +++ b/sdk/python/docs/source/index.rst @@ -359,28 +359,28 @@ Snowflake Online Store PostgreSQL Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore +.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStore :members: -.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStoreConfig :members: HBase Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore +.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore :members: -.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStoreConfig :members: Cassandra Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore +.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore :members: -.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig :members: Batch Materialization Engine diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md b/sdk/python/feast/infra/online_stores/cassandra_online_store/README.md similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md rename to sdk/python/feast/infra/online_stores/cassandra_online_store/README.md diff --git a/sdk/python/feast/infra/online_stores/contrib/__init__.py b/sdk/python/feast/infra/online_stores/cassandra_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/__init__.py rename to sdk/python/feast/infra/online_stores/cassandra_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/cassandra_online_store.py b/sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_online_store.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/cassandra_online_store.py rename to sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_online_store.py diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_repo_configuration.py b/sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/cassandra_repo_configuration.py rename to sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/__init__.py b/sdk/python/feast/infra/online_stores/elasticsearch/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/__init__.py rename to sdk/python/feast/infra/online_stores/elasticsearch/__init__.py diff --git a/sdk/python/feast/infra/online_stores/contrib/elasticsearch.py b/sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/elasticsearch.py rename to sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch.py diff --git a/sdk/python/feast/infra/online_stores/contrib/elasticsearch_repo_configuration.py b/sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/elasticsearch_repo_configuration.py rename to sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/contrib/faiss_online_store.py b/sdk/python/feast/infra/online_stores/faiss_online_store.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/faiss_online_store.py rename to sdk/python/feast/infra/online_stores/faiss_online_store.py diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/README.md b/sdk/python/feast/infra/online_stores/hazelcast_online_store/README.md similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/README.md rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/README.md diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/__init__.py b/sdk/python/feast/infra/online_stores/hazelcast_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/__init__.py rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/hazelcast_online_store.py b/sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_online_store.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/hazelcast_online_store.py rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_online_store.py diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_repo_configuration.py b/sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_repo_configuration.py rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_online_store/README.md b/sdk/python/feast/infra/online_stores/hbase_online_store/README.md similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hbase_online_store/README.md rename to sdk/python/feast/infra/online_stores/hbase_online_store/README.md diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_online_store/__init__.py b/sdk/python/feast/infra/online_stores/hbase_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hbase_online_store/__init__.py rename to sdk/python/feast/infra/online_stores/hbase_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_online_store/hbase.py b/sdk/python/feast/infra/online_stores/hbase_online_store/hbase.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hbase_online_store/hbase.py rename to sdk/python/feast/infra/online_stores/hbase_online_store/hbase.py diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_repo_configuration.py b/sdk/python/feast/infra/online_stores/hbase_online_store/hbase_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/hbase_repo_configuration.py rename to sdk/python/feast/infra/online_stores/hbase_online_store/hbase_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/contrib/ikv_online_store/__init__.py b/sdk/python/feast/infra/online_stores/ikv_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/ikv_online_store/__init__.py rename to sdk/python/feast/infra/online_stores/ikv_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/contrib/ikv_online_store/ikv.py b/sdk/python/feast/infra/online_stores/ikv_online_store/ikv.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/ikv_online_store/ikv.py rename to sdk/python/feast/infra/online_stores/ikv_online_store/ikv.py diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_online_store/README.md b/sdk/python/feast/infra/online_stores/mysql_online_store/README.md similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/mysql_online_store/README.md rename to sdk/python/feast/infra/online_stores/mysql_online_store/README.md diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_online_store/__init__.py b/sdk/python/feast/infra/online_stores/mysql_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/mysql_online_store/__init__.py rename to sdk/python/feast/infra/online_stores/mysql_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_online_store/mysql.py b/sdk/python/feast/infra/online_stores/mysql_online_store/mysql.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/mysql_online_store/mysql.py rename to sdk/python/feast/infra/online_stores/mysql_online_store/mysql.py diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_repo_configuration.py b/sdk/python/feast/infra/online_stores/mysql_online_store/mysql_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/mysql_repo_configuration.py rename to sdk/python/feast/infra/online_stores/mysql_online_store/mysql_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/postgres/__init__.py b/sdk/python/feast/infra/online_stores/postgres/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sdk/python/feast/infra/online_stores/contrib/pgvector_repo_configuration.py b/sdk/python/feast/infra/online_stores/postgres/pgvector_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/pgvector_repo_configuration.py rename to sdk/python/feast/infra/online_stores/postgres/pgvector_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/contrib/postgres.py b/sdk/python/feast/infra/online_stores/postgres/postgres.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/postgres.py rename to sdk/python/feast/infra/online_stores/postgres/postgres.py diff --git a/sdk/python/feast/infra/online_stores/contrib/postgres_repo_configuration.py b/sdk/python/feast/infra/online_stores/postgres/postgres_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/postgres_repo_configuration.py rename to sdk/python/feast/infra/online_stores/postgres/postgres_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/qdrant/__init__.py b/sdk/python/feast/infra/online_stores/qdrant/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sdk/python/feast/infra/online_stores/contrib/qdrant.py b/sdk/python/feast/infra/online_stores/qdrant/qdrant.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/qdrant.py rename to sdk/python/feast/infra/online_stores/qdrant/qdrant.py diff --git a/sdk/python/feast/infra/online_stores/contrib/qdrant_repo_configuration.py b/sdk/python/feast/infra/online_stores/qdrant/qdrant_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/qdrant_repo_configuration.py rename to sdk/python/feast/infra/online_stores/qdrant/qdrant_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/contrib/singlestore_online_store/singlestore.py b/sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/singlestore_online_store/singlestore.py rename to sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore.py diff --git a/sdk/python/feast/infra/online_stores/contrib/singlestore_repo_configuration.py b/sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/contrib/singlestore_repo_configuration.py rename to sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore_repo_configuration.py diff --git a/sdk/python/feast/repo_config.py b/sdk/python/feast/repo_config.py index b2b9374aa97..550c6b12dff 100644 --- a/sdk/python/feast/repo_config.py +++ b/sdk/python/feast/repo_config.py @@ -58,16 +58,16 @@ "dynamodb": "feast.infra.online_stores.dynamodb.DynamoDBOnlineStore", "snowflake.online": "feast.infra.online_stores.snowflake.SnowflakeOnlineStore", "bigtable": "feast.infra.online_stores.bigtable.BigtableOnlineStore", - "postgres": "feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore", - "hbase": "feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore", - "cassandra": "feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore", - "mysql": "feast.infra.online_stores.contrib.mysql_online_store.mysql.MySQLOnlineStore", - "hazelcast": "feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore", - "ikv": "feast.infra.online_stores.contrib.ikv_online_store.ikv.IKVOnlineStore", - "elasticsearch": "feast.infra.online_stores.contrib.elasticsearch.ElasticSearchOnlineStore", + "postgres": "feast.infra.online_stores.postgres.PostgreSQLOnlineStore", + "hbase": "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore", + "cassandra": "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore", + "mysql": "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore", + "hazelcast": "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore", + "ikv": "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore", + "elasticsearch": "feast.infra.online_stores.elasticsearch.ElasticSearchOnlineStore", "remote": "feast.infra.online_stores.remote.RemoteOnlineStore", - "singlestore": "feast.infra.online_stores.contrib.singlestore_online_store.singlestore.SingleStoreOnlineStore", - "qdrant": "feast.infra.online_stores.contrib.qdrant.QdrantOnlineStore", + "singlestore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", + "qdrant": "feast.infra.online_stores.cqdrant.QdrantOnlineStore", } OFFLINE_STORE_CLASS_FOR_TYPE = { From 1d6c3127cb48a9fa52a994c7fd214bb05b351aa0 Mon Sep 17 00:00:00 2001 From: HaoXuAI Date: Fri, 1 Nov 2024 23:22:10 -0700 Subject: [PATCH 2/6] feat: Refactor online store by removing the contrib directory Signed-off-by: HaoXuAI --- Makefile | 2 +- docs/reference/online-stores/postgres.md | 4 ++-- sdk/python/docs/index.rst | 4 ++-- sdk/python/docs/source/feast.infra.online_stores.contrib.rst | 4 ++-- sdk/python/docs/source/index.rst | 4 ++-- .../{postgres => postgres_online_store}/__init__.py | 0 .../pgvector_repo_configuration.py | 0 .../{postgres => postgres_online_store}/postgres.py | 0 .../postgres_repo_configuration.py | 0 sdk/python/feast/repo_config.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename sdk/python/feast/infra/online_stores/{postgres => postgres_online_store}/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{postgres => postgres_online_store}/pgvector_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{postgres => postgres_online_store}/postgres.py (100%) rename sdk/python/feast/infra/online_stores/{postgres => postgres_online_store}/postgres_repo_configuration.py (100%) diff --git a/Makefile b/Makefile index 1966d5a78c4..60906c311c5 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,7 @@ test-python-universal-postgres-offline: test-python-universal-postgres-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.postgres_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.postgres_online_store.postgres_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.postgres \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ diff --git a/docs/reference/online-stores/postgres.md b/docs/reference/online-stores/postgres.md index 278c382f639..d9ccfb75399 100644 --- a/docs/reference/online-stores/postgres.md +++ b/docs/reference/online-stores/postgres.md @@ -35,7 +35,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [PostgreSQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.postgres.PostgreSQLOnlineStoreConfig). +The full set of configuration options is available in [PostgreSQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStoreConfig). ## Functionality Matrix @@ -79,7 +79,7 @@ For the Retrieval Augmented Generation (RAG) use-case, you have to embed the qu {% code title="python" %} ```python from feast import FeatureStore -from feast.infra.online_stores.postgres import retrieve_online_documents +from feast.infra.online_stores.postgres_online_store import retrieve_online_documents feature_store = FeatureStore(repo_path=".") diff --git a/sdk/python/docs/index.rst b/sdk/python/docs/index.rst index e8f6267a6bc..14af6a6d9ef 100644 --- a/sdk/python/docs/index.rst +++ b/sdk/python/docs/index.rst @@ -359,10 +359,10 @@ Snowflake Online Store PostgreSQL Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStore +.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore :members: -.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStoreConfig :members: HBase Online Store diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst index cf5e751c58c..f7625a3c9a6 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst @@ -91,7 +91,7 @@ feast.infra.online\_stores.contrib.pgvector\_repo\_configuration module feast.infra.online\_stores.contrib.postgres module -------------------------------------------------- -.. automodule:: feast.infra.online_stores.postgres +.. automodule:: feast.infra.online_stores.postgres_online_store :members: :undoc-members: :show-inheritance: @@ -99,7 +99,7 @@ feast.infra.online\_stores.contrib.postgres module feast.infra.online\_stores.contrib.postgres\_repo\_configuration module ----------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.postgres_repo_configuration +.. automodule:: feast.infra.online_stores.postgres_online_store.postgres_repo_configuration :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/index.rst b/sdk/python/docs/source/index.rst index e8f6267a6bc..14af6a6d9ef 100644 --- a/sdk/python/docs/source/index.rst +++ b/sdk/python/docs/source/index.rst @@ -359,10 +359,10 @@ Snowflake Online Store PostgreSQL Online Store ----------------------- -.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStore +.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore :members: -.. autoclass:: feast.infra.online_stores.postgres.PostgreSQLOnlineStoreConfig +.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStoreConfig :members: HBase Online Store diff --git a/sdk/python/feast/infra/online_stores/postgres/__init__.py b/sdk/python/feast/infra/online_stores/postgres_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/postgres/__init__.py rename to sdk/python/feast/infra/online_stores/postgres_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/postgres/pgvector_repo_configuration.py b/sdk/python/feast/infra/online_stores/postgres_online_store/pgvector_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/postgres/pgvector_repo_configuration.py rename to sdk/python/feast/infra/online_stores/postgres_online_store/pgvector_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/postgres/postgres.py b/sdk/python/feast/infra/online_stores/postgres_online_store/postgres.py similarity index 100% rename from sdk/python/feast/infra/online_stores/postgres/postgres.py rename to sdk/python/feast/infra/online_stores/postgres_online_store/postgres.py diff --git a/sdk/python/feast/infra/online_stores/postgres/postgres_repo_configuration.py b/sdk/python/feast/infra/online_stores/postgres_online_store/postgres_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/postgres/postgres_repo_configuration.py rename to sdk/python/feast/infra/online_stores/postgres_online_store/postgres_repo_configuration.py diff --git a/sdk/python/feast/repo_config.py b/sdk/python/feast/repo_config.py index 550c6b12dff..515969ad172 100644 --- a/sdk/python/feast/repo_config.py +++ b/sdk/python/feast/repo_config.py @@ -58,7 +58,7 @@ "dynamodb": "feast.infra.online_stores.dynamodb.DynamoDBOnlineStore", "snowflake.online": "feast.infra.online_stores.snowflake.SnowflakeOnlineStore", "bigtable": "feast.infra.online_stores.bigtable.BigtableOnlineStore", - "postgres": "feast.infra.online_stores.postgres.PostgreSQLOnlineStore", + "postgres": "feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore", "hbase": "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore", "cassandra": "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore", "mysql": "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore", From 24fd7de4afb43ea37cf8e5c06fba97f6a2a81723 Mon Sep 17 00:00:00 2001 From: HaoXuAI Date: Sat, 2 Nov 2024 00:03:06 -0700 Subject: [PATCH 3/6] feat: Refactor online store by removing the contrib directory Signed-off-by: HaoXuAI --- Makefile | 12 ++++++------ .../adding-support-for-a-new-online-store.md | 2 +- docs/reference/online-stores/elasticsearch.md | 2 +- docs/reference/online-stores/mysql.md | 2 +- docs/reference/online-stores/qdrant.md | 2 +- .../source/feast.infra.online_stores.contrib.rst | 14 +++++++------- .../__init__.py | 0 .../elasticsearch.py | 0 .../elasticsearch_repo_configuration.py | 0 .../{qdrant => qdrant_online_store}/__init__.py | 0 .../{qdrant => qdrant_online_store}/qdrant.py | 0 .../qdrant_repo_configuration.py | 0 sdk/python/feast/repo_config.py | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) rename sdk/python/feast/infra/online_stores/{elasticsearch => elasticsearch_online_store}/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{elasticsearch => elasticsearch_online_store}/elasticsearch.py (100%) rename sdk/python/feast/infra/online_stores/{elasticsearch => elasticsearch_online_store}/elasticsearch_repo_configuration.py (100%) rename sdk/python/feast/infra/online_stores/{qdrant => qdrant_online_store}/__init__.py (100%) rename sdk/python/feast/infra/online_stores/{qdrant => qdrant_online_store}/qdrant.py (100%) rename sdk/python/feast/infra/online_stores/{qdrant => qdrant_online_store}/qdrant_repo_configuration.py (100%) diff --git a/Makefile b/Makefile index 60906c311c5..589fcca7b8d 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,7 @@ test-python-universal-postgres-online: test-python-universal-mysql-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.mysql_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.mysql_online_store.mysql_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.mysql \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -280,14 +280,14 @@ test-python-universal-postgres-online: test-python-universal-cassandra: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \ python -m pytest -x --integration \ sdk/python/tests test-python-universal-hazelcast: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.hazelcast_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.hazelcast_online_store.hazelcast_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.hazelcast \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -306,7 +306,7 @@ test-python-universal-hazelcast: test-python-universal-cassandra-no-cloud-providers: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \ python -m pytest -x --integration \ -k "not test_lambda_materialization_consistency and \ @@ -323,7 +323,7 @@ test-python-universal-cassandra-no-cloud-providers: test-python-universal-elasticsearch-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.elasticsearch_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.elasticsearch_online_store.elasticsearch_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.elasticsearch \ python -m pytest -n 8 --integration \ -k "not test_universal_cli and \ @@ -353,7 +353,7 @@ test-python-universal-singlestore-online: test-python-universal-qdrant-online: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.qdrant_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.qdrant_online_store.qdrant_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.qdrant \ python -m pytest -n 8 --integration \ -k "test_retrieve_online_documents" \ diff --git a/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md b/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md index 5863818cc23..5e26f133cef 100644 --- a/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md +++ b/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md @@ -372,7 +372,7 @@ class RedisOnlineStoreCreator(OnlineStoreCreator): ```Makefile test-python-universal-cassandra: PYTHONPATH='.' \ - FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_repo_configuration \ + FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration \ PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \ IS_TEST=True \ python -m pytest -x --integration \ diff --git a/docs/reference/online-stores/elasticsearch.md b/docs/reference/online-stores/elasticsearch.md index 33e447055ed..d145b3ea4b4 100644 --- a/docs/reference/online-stores/elasticsearch.md +++ b/docs/reference/online-stores/elasticsearch.md @@ -26,7 +26,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [ElasticsearchOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.elasticsearch.ElasticsearchOnlineStoreConfig). +The full set of configuration options is available in [ElasticsearchOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.elasticsearch_online_store.ElasticsearchOnlineStoreConfig). ## Functionality Matrix diff --git a/docs/reference/online-stores/mysql.md b/docs/reference/online-stores/mysql.md index 3cacb2b1340..a92dd7b5557 100644 --- a/docs/reference/online-stores/mysql.md +++ b/docs/reference/online-stores/mysql.md @@ -26,7 +26,7 @@ online_store: ``` {% endcode %} -The full set of configuration options is available in [MySQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.mysql.MySQLOnlineStoreConfig). +The full set of configuration options is available in [MySQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.mysql_online_store.MySQLOnlineStoreConfig). ## Functionality Matrix diff --git a/docs/reference/online-stores/qdrant.md b/docs/reference/online-stores/qdrant.md index 667e6844767..908a41339a4 100644 --- a/docs/reference/online-stores/qdrant.md +++ b/docs/reference/online-stores/qdrant.md @@ -26,7 +26,7 @@ online_store: {% endcode %} -The full set of configuration options is available in [QdrantOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.qdrant.QdrantOnlineStoreConfig). +The full set of configuration options is available in [QdrantOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.qdrant_online_store.QdrantOnlineStoreConfig). ## Functionality Matrix diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst index f7625a3c9a6..0ca722d90fe 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst @@ -19,7 +19,7 @@ Submodules feast.infra.online\_stores.contrib.cassandra\_repo\_configuration module ------------------------------------------------------------------------ -.. automodule:: feast.infra.online_stores.cassandra_repo_configuration +.. automodule:: feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration :members: :undoc-members: :show-inheritance: @@ -27,7 +27,7 @@ feast.infra.online\_stores.contrib.cassandra\_repo\_configuration module feast.infra.online\_stores.contrib.elasticsearch module ------------------------------------------------------- -.. automodule:: feast.infra.online_stores.elasticsearch +.. automodule:: feast.infra.online_stores.elasticsearch_online_store :members: :undoc-members: :show-inheritance: @@ -35,7 +35,7 @@ feast.infra.online\_stores.contrib.elasticsearch module feast.infra.online\_stores.contrib.elasticsearch\_repo\_configuration module ---------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.elasticsearch_repo_configuration +.. automodule:: feast.infra.online_stores.elasticsearch_online_store.elasticsearch_repo_configuration :members: :undoc-members: :show-inheritance: @@ -43,7 +43,7 @@ feast.infra.online\_stores.contrib.elasticsearch\_repo\_configuration module feast.infra.online\_stores.contrib.qdrant module ------------------------------------------------------- -.. automodule:: feast.infra.online_stores.qdrant +.. automodule:: feast.infra.online_stores.qdrant_online_store :members: :undoc-members: :show-inheritance: @@ -51,7 +51,7 @@ feast.infra.online\_stores.contrib.qdrant module feast.infra.online\_stores.contrib.qdrant\_repo\_configuration module ---------------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.qdrant_repo_configuration +.. automodule:: feast.infra.online_stores.qdrant_online_store.qdrant_repo_configuration :members: :undoc-members: :show-inheritance: @@ -59,7 +59,7 @@ feast.infra.online\_stores.contrib.qdrant\_repo\_configuration module feast.infra.online\_stores.contrib.hazelcast\_repo\_configuration module ------------------------------------------------------------------------ -.. automodule:: feast.infra.online_stores.hazelcast_repo_configuration +.. automodule:: feast.infra.online_stores.hazelcast_online_store.hazelcast_repo_configuration :members: :undoc-members: :show-inheritance: @@ -75,7 +75,7 @@ feast.infra.online\_stores.contrib.hbase\_repo\_configuration module feast.infra.online\_stores.contrib.mysql\_repo\_configuration module -------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.mysql_repo_configuration +.. automodule:: feast.infra.online_stores.mysql_online_store.mysql_repo_configuration :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/feast/infra/online_stores/elasticsearch/__init__.py b/sdk/python/feast/infra/online_stores/elasticsearch_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/elasticsearch/__init__.py rename to sdk/python/feast/infra/online_stores/elasticsearch_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch.py b/sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch.py similarity index 100% rename from sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch.py rename to sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch.py diff --git a/sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch_repo_configuration.py b/sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/elasticsearch/elasticsearch_repo_configuration.py rename to sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch_repo_configuration.py diff --git a/sdk/python/feast/infra/online_stores/qdrant/__init__.py b/sdk/python/feast/infra/online_stores/qdrant_online_store/__init__.py similarity index 100% rename from sdk/python/feast/infra/online_stores/qdrant/__init__.py rename to sdk/python/feast/infra/online_stores/qdrant_online_store/__init__.py diff --git a/sdk/python/feast/infra/online_stores/qdrant/qdrant.py b/sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant.py similarity index 100% rename from sdk/python/feast/infra/online_stores/qdrant/qdrant.py rename to sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant.py diff --git a/sdk/python/feast/infra/online_stores/qdrant/qdrant_repo_configuration.py b/sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant_repo_configuration.py similarity index 100% rename from sdk/python/feast/infra/online_stores/qdrant/qdrant_repo_configuration.py rename to sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant_repo_configuration.py diff --git a/sdk/python/feast/repo_config.py b/sdk/python/feast/repo_config.py index 515969ad172..ea42ed4250e 100644 --- a/sdk/python/feast/repo_config.py +++ b/sdk/python/feast/repo_config.py @@ -64,7 +64,7 @@ "mysql": "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore", "hazelcast": "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore", "ikv": "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore", - "elasticsearch": "feast.infra.online_stores.elasticsearch.ElasticSearchOnlineStore", + "elasticsearch": "feast.infra.online_stores.elasticsearch_online_store.ElasticSearchOnlineStore", "remote": "feast.infra.online_stores.remote.RemoteOnlineStore", "singlestore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", "qdrant": "feast.infra.online_stores.cqdrant.QdrantOnlineStore", From 13620e87993b544323dca3e36f0e36275d54b36b Mon Sep 17 00:00:00 2001 From: HaoXuAI Date: Sat, 2 Nov 2024 00:08:12 -0700 Subject: [PATCH 4/6] feat: Refactor online store by removing the contrib directory Signed-off-by: HaoXuAI --- sdk/python/docs/source/feast.infra.online_stores.contrib.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst index 0ca722d90fe..b6fad4cc8e3 100644 --- a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst +++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst @@ -67,7 +67,7 @@ feast.infra.online\_stores.contrib.hazelcast\_repo\_configuration module feast.infra.online\_stores.contrib.hbase\_repo\_configuration module -------------------------------------------------------------------- -.. automodule:: feast.infra.online_stores.hbase_repo_configuration +.. automodule:: feast.infra.online_stores.hbase_online_store.hbase_repo_configuration :members: :undoc-members: :show-inheritance: From 537cdd79433f92eedadfe0668fd9dd85a8d4d3a1 Mon Sep 17 00:00:00 2001 From: HaoXuAI Date: Sun, 3 Nov 2024 22:43:41 -0800 Subject: [PATCH 5/6] fix legacy mapping Signed-off-by: HaoXuAI --- docs/SUMMARY.md | 10 ++++----- docs/reference/online-stores/cassandra.md | 2 +- docs/reference/online-stores/elasticsearch.md | 2 +- docs/reference/online-stores/mysql.md | 2 +- docs/reference/online-stores/postgres.md | 2 +- docs/reference/online-stores/qdrant.md | 2 +- docs/reference/online-stores/singlestore.md | 2 +- sdk/python/feast/repo_config.py | 22 +++++++++++++++++++ 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index b7faf526c28..bd08a998b89 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -105,12 +105,12 @@ * [DynamoDB](reference/online-stores/dynamodb.md) * [Bigtable](reference/online-stores/bigtable.md) * [Remote](reference/online-stores/remote.md) - * [PostgreSQL (contrib)](reference/online-stores/postgres.md) + * [PostgreSQL](reference/online-stores/postgres.md) * [Cassandra + Astra DB (contrib)](reference/online-stores/cassandra.md) - * [MySQL (contrib)](reference/online-stores/mysql.md) - * [Hazelcast (contrib)](reference/online-stores/hazelcast.md) - * [ScyllaDB (contrib)](reference/online-stores/scylladb.md) - * [SingleStore (contrib)](reference/online-stores/singlestore.md) + * [MySQL](reference/online-stores/mysql.md) + * [Hazelcast](reference/online-stores/hazelcast.md) + * [ScyllaDB](reference/online-stores/scylladb.md) + * [SingleStore](reference/online-stores/singlestore.md) * [Registries](reference/registries/README.md) * [Local](reference/registries/local.md) * [S3](reference/registries/s3.md) diff --git a/docs/reference/online-stores/cassandra.md b/docs/reference/online-stores/cassandra.md index 5a14ce8c56f..198f15ca47f 100644 --- a/docs/reference/online-stores/cassandra.md +++ b/docs/reference/online-stores/cassandra.md @@ -1,4 +1,4 @@ -# Cassandra + Astra DB online store (contrib) +# Cassandra + Astra DB online store ## Description diff --git a/docs/reference/online-stores/elasticsearch.md b/docs/reference/online-stores/elasticsearch.md index d145b3ea4b4..81d267a1c65 100644 --- a/docs/reference/online-stores/elasticsearch.md +++ b/docs/reference/online-stores/elasticsearch.md @@ -1,4 +1,4 @@ -# ElasticSearch online store (contrib) +# ElasticSearch online store ## Description diff --git a/docs/reference/online-stores/mysql.md b/docs/reference/online-stores/mysql.md index a92dd7b5557..8868e64279d 100644 --- a/docs/reference/online-stores/mysql.md +++ b/docs/reference/online-stores/mysql.md @@ -1,4 +1,4 @@ -# MySQL online store (contrib) +# MySQL online store ## Description diff --git a/docs/reference/online-stores/postgres.md b/docs/reference/online-stores/postgres.md index d9ccfb75399..53feaff3dfe 100644 --- a/docs/reference/online-stores/postgres.md +++ b/docs/reference/online-stores/postgres.md @@ -1,4 +1,4 @@ -# PostgreSQL online store (contrib) +# PostgreSQL online store ## Description diff --git a/docs/reference/online-stores/qdrant.md b/docs/reference/online-stores/qdrant.md index 908a41339a4..d3f1eebf319 100644 --- a/docs/reference/online-stores/qdrant.md +++ b/docs/reference/online-stores/qdrant.md @@ -1,4 +1,4 @@ -# Qdrant online store (contrib) +# Qdrant online store ## Description diff --git a/docs/reference/online-stores/singlestore.md b/docs/reference/online-stores/singlestore.md index 1777787f227..7272233b9dc 100644 --- a/docs/reference/online-stores/singlestore.md +++ b/docs/reference/online-stores/singlestore.md @@ -1,4 +1,4 @@ -# SingleStore online store (contrib) +# SingleStore online store ## Description diff --git a/sdk/python/feast/repo_config.py b/sdk/python/feast/repo_config.py index ea42ed4250e..7a784da2976 100644 --- a/sdk/python/feast/repo_config.py +++ b/sdk/python/feast/repo_config.py @@ -51,6 +51,27 @@ "spark.engine": "feast.infra.materialization.contrib.spark.spark_materialization_engine.SparkMaterializationEngine", } +LEGACY_ONLINE_STORE_CLASS_FOR_TYPE = { + "feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore": + "feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore", + "feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore": + "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore", + "feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore": + "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore", + "feast.infra.online_stores.contrib.mysql_online_store.mysql.MySQLOnlineStore": + "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore", + "feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore": + "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore", + "feast.infra.online_stores.contrib.ikv_online_store.ikv.IKVOnlineStore": + "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore", + "feast.infra.online_stores.contrib.elasticsearch.ElasticSearchOnlineStore": + "feast.infra.online_stores.elasticsearch_online_store.ElasticSearchOnlineStore", + "feast.infra.online_stores.contrib.singlestore_online_store.singlestore.SingleStoreOnlineStore": + "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", + "feast.infra.online_stores.contrib.qdrant.QdrantOnlineStore": + "feast.infra.online_stores.cqdrant.QdrantOnlineStore" +} + ONLINE_STORE_CLASS_FOR_TYPE = { "sqlite": "feast.infra.online_stores.sqlite.SqliteOnlineStore", "datastore": "feast.infra.online_stores.datastore.DatastoreOnlineStore", @@ -68,6 +89,7 @@ "remote": "feast.infra.online_stores.remote.RemoteOnlineStore", "singlestore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", "qdrant": "feast.infra.online_stores.cqdrant.QdrantOnlineStore", + **LEGACY_ONLINE_STORE_CLASS_FOR_TYPE } OFFLINE_STORE_CLASS_FOR_TYPE = { From 568dea00312a8657fe0f7edfa1dee11bb7980687 Mon Sep 17 00:00:00 2001 From: HaoXuAI Date: Sun, 3 Nov 2024 22:44:36 -0800 Subject: [PATCH 6/6] fix legacy mapping Signed-off-by: HaoXuAI --- sdk/python/feast/repo_config.py | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/sdk/python/feast/repo_config.py b/sdk/python/feast/repo_config.py index 7a784da2976..759e1e084f6 100644 --- a/sdk/python/feast/repo_config.py +++ b/sdk/python/feast/repo_config.py @@ -52,24 +52,15 @@ } LEGACY_ONLINE_STORE_CLASS_FOR_TYPE = { - "feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore": - "feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore", - "feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore": - "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore", - "feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore": - "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore", - "feast.infra.online_stores.contrib.mysql_online_store.mysql.MySQLOnlineStore": - "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore", - "feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore": - "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore", - "feast.infra.online_stores.contrib.ikv_online_store.ikv.IKVOnlineStore": - "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore", - "feast.infra.online_stores.contrib.elasticsearch.ElasticSearchOnlineStore": - "feast.infra.online_stores.elasticsearch_online_store.ElasticSearchOnlineStore", - "feast.infra.online_stores.contrib.singlestore_online_store.singlestore.SingleStoreOnlineStore": - "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", - "feast.infra.online_stores.contrib.qdrant.QdrantOnlineStore": - "feast.infra.online_stores.cqdrant.QdrantOnlineStore" + "feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore": "feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore", + "feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore": "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore", + "feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore": "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore", + "feast.infra.online_stores.contrib.mysql_online_store.mysql.MySQLOnlineStore": "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore", + "feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore": "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore", + "feast.infra.online_stores.contrib.ikv_online_store.ikv.IKVOnlineStore": "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore", + "feast.infra.online_stores.contrib.elasticsearch.ElasticSearchOnlineStore": "feast.infra.online_stores.elasticsearch_online_store.ElasticSearchOnlineStore", + "feast.infra.online_stores.contrib.singlestore_online_store.singlestore.SingleStoreOnlineStore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", + "feast.infra.online_stores.contrib.qdrant.QdrantOnlineStore": "feast.infra.online_stores.cqdrant.QdrantOnlineStore", } ONLINE_STORE_CLASS_FOR_TYPE = { @@ -89,7 +80,7 @@ "remote": "feast.infra.online_stores.remote.RemoteOnlineStore", "singlestore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore", "qdrant": "feast.infra.online_stores.cqdrant.QdrantOnlineStore", - **LEGACY_ONLINE_STORE_CLASS_FOR_TYPE + **LEGACY_ONLINE_STORE_CLASS_FOR_TYPE, } OFFLINE_STORE_CLASS_FOR_TYPE = {