Merge branch 'dev' into support-for-Weaviate

zilliztech · Jul 7, 2023 · 8460083 · 8460083
2 parents 9c90089 + 2852a41
commit 8460083
Show file tree

Hide file tree

Showing 17 changed files with 586 additions and 84 deletions.
diff --git a/.github/workflows/Nightly_CI_main.yaml b/.github/workflows/Nightly_CI_main.yaml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@main
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
           cache: pip

diff --git a/.github/workflows/build_dev_python_package.yaml b/.github/workflows/build_dev_python_package.yaml
@@ -28,7 +28,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Setup Python
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     # - name: Get history and tags for SCM versioning

diff --git a/.github/workflows/publish_dev_package.yaml b/.github/workflows/publish_dev_package.yaml
@@ -34,7 +34,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Setup Python
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     # - name: Get history and tags for SCM versioning

diff --git a/.github/workflows/publish_release_package.yaml b/.github/workflows/publish_release_package.yaml
@@ -28,7 +28,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Setup Python
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     # - name: Get history and tags for SCM versioning

diff --git a/.github/workflows/pylint.yaml b/.github/workflows/pylint.yaml
@@ -32,7 +32,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3.0.0
     - name: Setup Python
-      uses: actions/setup-python@v3.0.0
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Python pylint

diff --git a/.github/workflows/unit_test_main.yaml b/.github/workflows/unit_test_main.yaml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@main
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
           cache: pip

diff --git a/gptcache/manager/scalar_data/base.py b/gptcache/manager/scalar_data/base.py
@@ -120,7 +120,7 @@ def get_ids(self, deleted=True):
         pass
 
     @abstractmethod
-    def count(self):
+    def count(self, state: int = 0, is_all: bool = False):
         pass
 
     def flush(self):

diff --git a/gptcache/manager/scalar_data/manager.py b/gptcache/manager/scalar_data/manager.py
@@ -93,6 +93,15 @@ def get(name, **kwargs):
                 username=kwargs.get("username"),
                 password=kwargs.get("password")
             )
+        elif name == "redis":
+            from gptcache.manager.scalar_data.redis_storage import RedisCacheStorage
+
+            return RedisCacheStorage(
+                host=kwargs.pop("redis_host", "localhost"),
+                port=kwargs.pop("redis_port", 6379),
+                global_key_prefix=kwargs.pop("global_key_prefix", TABLE_NAME),
+                **kwargs
+            )
         else:
             raise NotFoundError("cache store", name)
         return cache_base
diff --git a/gptcache/manager/scalar_data/mongo.py b/gptcache/manager/scalar_data/mongo.py
@@ -8,9 +8,10 @@
 
 import_mongodb()
 
-from mongoengine import Document  # pylint: disable=wrong-import-position
-from mongoengine import fields  # pylint: disable=wrong-import-position
-import mongoengine as me  # pylint: disable=wrong-import-position
+# pylint: disable=C0413
+from mongoengine import Document
+from mongoengine import fields
+import mongoengine as me
 
 
 def get_models():
@@ -253,7 +254,7 @@ def list_sessions(self, session_id=None, key=None):
         if session_id:
             query["session_id"] = session_id
         if key:
-            query["_id"] = key
+            query["question_id"] = key
 
         return self._session.objects(__raw__=query)