clarifai 10.5.4__tar.gz → 10.7.0__tar.gz

{clarifai-10.5.4 → clarifai-10.7.0}/MANIFEST.in

@@ -1,4 +1,4 @@
 global-include *.css
 include clarifai/modules/style.css
 recursive-include clarifai *
-include VERSION requirements.txt
+include requirements.txt

{clarifai-10.5.4/clarifai.egg-info → clarifai-10.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.5.4
+Version: 10.7.0
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,7 +20,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=10.5.0
+Requires-Dist: clarifai-grpc>=10.7.0
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: tritonclient>=2.34.0

clarifai-10.7.0/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "10.7.0"

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai/client/app.py

@@ -592,6 +592,32 @@ class App(Lister, BaseClient):
     """
     return Inputs.from_auth_helper(self.auth_helper)
 
+  def patch_dataset(self, dataset_id: str, action: str = 'merge', **kwargs) -> Dataset:
+    """Patches a dataset for the app.
+
+    Args:
+        dataset_id (str): The dataset ID for the dataset to create.
+        action (str): The action to perform on the dataset (merge/overwrite/remove).
+        **kwargs: Additional keyword arguments to be passed to patch the Dataset.
+
+    Returns:
+        Dataset: A Dataset object for the specified dataset ID.
+    """
+    if "visibility" in kwargs:
+      kwargs["visibility"] = resources_pb2.Visibility(gettable=kwargs["visibility"])
+    if "image_url" in kwargs:
+      kwargs["image"] = resources_pb2.Image(url=kwargs.pop("image_url"))
+    request = service_pb2.PatchDatasetsRequest(
+        user_app_id=self.user_app_id,
+        datasets=[resources_pb2.Dataset(id=dataset_id, **kwargs)],
+        action=action)
+    response = self._grpc_request(self.STUB.PatchDatasets, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nDataset patched\n%s", response.status)
+
+    return Dataset.from_auth_helper(self.auth_helper, dataset_id=dataset_id, **kwargs)
+
   def delete_dataset(self, dataset_id: str) -> None:
     """Deletes an dataset for the user.
 

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai/client/base.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from typing import Any, Callable
 
+from clarifai_grpc.grpc.api import resources_pb2
 from google.protobuf import struct_pb2
 from google.protobuf.timestamp_pb2 import Timestamp
 from google.protobuf.wrappers_pb2 import BoolValue
@@ -176,6 +177,10 @@ class BaseClient:
             continue
           elif key == 'size':
             value = int(value)
+          elif key == 'image_info':
+            value = resources_pb2.ImageInfo(**value)
+          elif key == 'hosted_image_info':
+            continue
           elif key in ['metadata']:
             if isinstance(value, dict) and value != {}:
               value_s = struct_pb2.Struct()

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai/client/search.py

@@ -277,7 +277,8 @@ class Search(Lister, BaseClient):
         Get successful inputs of type image or text
         >>> from clarifai.client.search import Search
         >>> search = Search(user_id='user_id', app_id='app_id', top_k=10, metric='cosine')
-        >>> res = search.query(filters=[{'input_types': ['image', 'text']}, {'input_status_code': 30000}])
+        # This performs OR operation on input_types and input_status_code
+        >>> res = search.query(filters=[{'input_types': ['image', 'text'], 'input_status_code': 30000}])
 
         Vector search over inputs
         >>> from clarifai.client.search import Search
@@ -298,43 +299,27 @@ class Search(Lister, BaseClient):
       raise UserError(f"Invalid rank or filter input: {err}")
 
     # For each rank, create a Rank proto message
-    rank_annot_proto = []
+    # For ranks it only allows resources_pb2.Annotation proto, so no need of splitting protos into annotation and input.
+    all_ranks = []
     for rank_dict in ranks:
-      rank_annot_proto.append(self._get_annot_proto(**rank_dict))
-    all_ranks = [resources_pb2.Rank(annotation=rank_annot) for rank_annot in rank_annot_proto]
-
-    # Calls PostInputsSearches for annotation ranks, input filters
-    if any(["input" in k for k in filters[0].keys()]):
-      filters_input_proto = []
-      for filter_dict in filters:
-        filters_input_proto.append(self._get_input_proto(**filter_dict))
-      all_filters = [
-          resources_pb2.Filter(input=filter_input) for filter_input in filters_input_proto
-      ]
-      request_data = dict(
-          user_app_id=self.user_app_id,
-          searches=[
-              resources_pb2.Search(
-                  query=resources_pb2.Query(ranks=all_ranks, filters=all_filters),
-                  algorithm=self.algorithm,
-                  metric=self.metric_distance)
-          ])
-      if self.pagination:
-        return self._list_all_pages_generator(self.STUB.PostInputsSearches,
-                                              service_pb2.PostInputsSearchesRequest, request_data,
-                                              page_no, per_page)
-      return self._list_topk_generator(self.STUB.PostInputsSearches,
-                                       service_pb2.PostInputsSearchesRequest, request_data)
-
-    # Calls PostAnnotationsSearches for annotation ranks, filters
-    filters_annot_proto = []
-    for filter_dict in filters:
-      filters_annot_proto.append(self._get_annot_proto(**filter_dict))
-
-    all_filters = [
-        resources_pb2.Filter(annotation=filter_annot) for filter_annot in filters_annot_proto
-    ]
-
+      rank_annot_proto = self._get_annot_proto(**rank_dict)
+      all_ranks.append(resources_pb2.Rank(annotation=rank_annot_proto))
+
+    all_filters = []
+    # check for filters which is compatible with input proto
+    for each_filter in filters:
+      input_dict = {
+          key: each_filter.pop(key)
+          for key in ['input_types', 'input_dataset_ids', 'input_status_code']
+          if key in each_filter
+      }
+
+      all_filters.append(
+          resources_pb2.Filter(
+              annotation=self._get_annot_proto(**each_filter),
+              input=self._get_input_proto(**input_dict)))
+
+    # Create a PostInputsSearchesRequest proto message
     request_data = dict(
         user_app_id=self.user_app_id,
         searches=[
@@ -343,9 +328,10 @@ class Search(Lister, BaseClient):
                 algorithm=self.algorithm,
                 metric=self.metric_distance)
         ])
+    # Calls PostInputsSearches for annotation ranks, input filters
     if self.pagination:
-      return self._list_all_pages_generator(self.STUB.PostAnnotationsSearches,
-                                            service_pb2.PostAnnotationsSearchesRequest,
-                                            request_data, page_no, per_page)
-    return self._list_topk_generator(self.STUB.PostAnnotationsSearches,
-                                     service_pb2.PostAnnotationsSearchesRequest, request_data)
+      return self._list_all_pages_generator(self.STUB.PostInputsSearches,
+                                            service_pb2.PostInputsSearchesRequest, request_data,
+                                            page_no, per_page)
+    return self._list_topk_generator(self.STUB.PostInputsSearches,
+                                     service_pb2.PostInputsSearchesRequest, request_data)

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai/client/user.py

@@ -3,6 +3,7 @@ from typing import Any, Dict, Generator, List
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
 from clarifai_grpc.grpc.api.status import status_code_pb2
 from google.protobuf.json_format import MessageToDict
+from google.protobuf.wrappers_pb2 import BoolValue
 
 from clarifai.client.app import App
 from clarifai.client.base import BaseClient
@@ -222,6 +223,38 @@ class User(Lister, BaseClient):
 
     return dict(self.auth_helper, check_runner_exists=False, **kwargs)
 
+  def patch_app(self, app_id: str, action: str = 'overwrite', **kwargs) -> App:
+    """Patch an app for the user.
+
+    Args:
+        app_id (str): The app ID for the app to patch.
+        action (str): The action to perform on the app (overwrite/remove).
+        **kwargs: Additional keyword arguments to be passed to patch the App.
+
+    Returns:
+        App: Patched App object for the specified app ID.
+    """
+    if "base_workflow" in kwargs:
+      kwargs["default_workflow"] = resources_pb2.Workflow(
+          id=kwargs.pop("base_workflow"), app_id="main", user_id="clarifai")
+    if "visibility" in kwargs:
+      kwargs["visibility"] = resources_pb2.Visibility(gettable=kwargs["visibility"])
+    if "image_url" in kwargs:
+      kwargs["image"] = resources_pb2.Image(url=kwargs.pop("image_url"))
+    if "is_template" in kwargs:
+      kwargs["is_template"] = BoolValue(value=kwargs["is_template"])
+    request = service_pb2.PatchAppRequest(
+        user_app_id=resources_pb2.UserAppIDSet(user_id=self.id, app_id=app_id),
+        app=resources_pb2.App(id=app_id, **kwargs),
+        action=action,
+        reindex=False)
+    response = self._grpc_request(self.STUB.PatchApp, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nApp patched\n%s", response.status)
+
+    return App.from_auth_helper(auth=self.auth_helper, app_id=app_id)
+
   def delete_app(self, app_id: str) -> None:
     """Deletes an app for the user.
 

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai/versions.py

@@ -1,6 +1,7 @@
 import os
+from clarifai import __version__
 
-CLIENT_VERSION = "10.5.4"
+CLIENT_VERSION = __version__
 OS_VER = os.sys.platform
 PYTHON_VERSION = '.'.join(
     map(str, [os.sys.version_info.major, os.sys.version_info.minor, os.sys.version_info.micro]))

{clarifai-10.5.4 → clarifai-10.7.0/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.5.4
+Version: 10.7.0
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,7 +20,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=10.5.0
+Requires-Dist: clarifai-grpc>=10.7.0
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: tritonclient>=2.34.0

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENSE
 MANIFEST.in
 README.md
-VERSION
 pyproject.toml
 requirements.txt
 setup.py

{clarifai-10.5.4 → clarifai-10.7.0}/clarifai.egg-info/requires.txt

@@ -1,4 +1,4 @@
-clarifai-grpc>=10.5.0
+clarifai-grpc>=10.7.0
 numpy>=1.22.0
 tqdm>=4.65.0
 tritonclient>=2.34.0

{clarifai-10.5.4 → clarifai-10.7.0}/requirements.txt

@@ -1,4 +1,4 @@
-clarifai-grpc>=10.5.0
+clarifai-grpc>=10.7.0
 numpy>=1.22.0
 tqdm>=4.65.0
 tritonclient>=2.34.0

{clarifai-10.5.4 → clarifai-10.7.0}/setup.py

@@ -1,10 +1,15 @@
+import re
+
 import setuptools
 
 with open("README.md", "r") as fh:
   long_description = fh.read()
 
-with open("VERSION", "r") as f:
-  version = f.read().strip()
+with open("./clarifai/__init__.py") as f:
+  content = f.read()
+_search_version = re.search(r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]', content)
+assert _search_version
+version = _search_version.group(1)
 
 with open("requirements.txt", "r") as fh:
   install_requires = fh.read().split('\n')

{clarifai-10.5.4 → clarifai-10.7.0}/tests/test_app.py

@@ -22,6 +22,9 @@ CREATE_DATASET_ID = f"ci_test_dataset_{NOW}"
 CREATE_MODULE_ID = f"ci_test_module_{NOW}"
 CREATE_RUNNER_ID = f"ci_test_runner_{NOW}"
 
+#assets
+IMAGE_URL = "https://samples.clarifai.com/metro-north.jpg"
+
 CLARIFAI_PAT = os.environ["CLARIFAI_PAT"]
 
 
@@ -124,6 +127,31 @@ class TestApp:
     assert os.path.exists('tests/output_demo.zip') is True
     os.remove('tests/output_demo.zip')
 
+  def test_patch_app(self, caplog):
+    with caplog.at_level(logging.INFO):
+      User(user_id=CREATE_APP_USER_ID).patch_app(
+          app_id=CREATE_APP_ID,
+          action='overwrite',
+          default_language='en',
+          base_workflow='Universal',
+          description='App Patching Test',
+          is_template=True,
+          visibility=10,
+          notes='App Patching Notes Test',
+          image_url=IMAGE_URL)
+      assert "SUCCESS" in caplog.text
+
+  def test_patch_dataset(self, create_app, caplog):
+    with caplog.at_level(logging.INFO):
+      create_app.patch_dataset(
+          dataset_id=CREATE_DATASET_ID,
+          action='merge',
+          description='App Patching Test',
+          visibility=10,
+          notes='App Patching Notes Test',
+          image_url=IMAGE_URL)
+      assert "SUCCESS" in caplog.text
+
   def test_delete_dataset(self, create_app, caplog):
     with caplog.at_level(logging.INFO):
       create_app.delete_dataset(CREATE_DATASET_ID)

{clarifai-10.5.4 → clarifai-10.7.0}/tests/test_search.py

@@ -114,6 +114,8 @@ class TestAnnotationSearch:
         user_id=CREATE_APP_USER_ID, app_id=CREATE_APP_ID, top_k=1, metric="euclidean")
     cls.search_with_pagination = Search(
         user_id=CREATE_APP_USER_ID, app_id=CREATE_APP_ID, metric="euclidean", pagination=True)
+    cls.search_deduplicate = Search(
+        user_id=CREATE_APP_USER_ID, app_id=CREATE_APP_ID, top_k=2, metric="euclidean")
     cls.upload_data()
 
   @classmethod
@@ -212,5 +214,13 @@ class TestAnnotationSearch:
     with pytest.raises(UserError):
       _ = self.search.query(filters=[{"input_id": "test"}])
 
+  def test_rank_search_deduplicate(self):
+    query = self.search_deduplicate.query(ranks=[{
+        "image_url": "https://samples.clarifai.com/dog.tiff"
+    }])
+    for q in query:
+      assert len(q.hits) == 2
+      assert q.hits[0].input.id != q.hits[1].input.id
+
   def teardown_class(cls):
     cls.client.delete_app(app_id=CREATE_APP_ID)

clarifai-10.5.4/VERSION

@@ -1 +0,0 @@
-10.5.4