clarifai 10.5.4__py3-none-any.whl → 10.7.0__py3-none-any.whl

clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "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/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/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/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/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.dist-info → clarifai-10.7.0.dist-info}/METADATA

@@ -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.dist-info → clarifai-10.7.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-clarifai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/__init__.py,sha256=9VjBfsEYJF5PsmYbaZqem3HOFjLlVd77_XvGC9hBJrQ,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
-clarifai/versions.py,sha256=_ce_y-64EmSRIfWAk92G7sa7D3E2Wk4HRM5Sh2iBBTo,186
+clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
 clarifai/client/__init__.py,sha256=xI1U0l5AZdRThvQAXCLsd9axxyFzXXJ22m8LHqVjQRU,662
-clarifai/client/app.py,sha256=br3C2paGmWzKu4eG0kUN1m8kDPKqpGPq28f7Xiy2v54,27329
-clarifai/client/base.py,sha256=wStnn_gS6sYo36OlYRzEkOFShXOQg3DKUp8i6DomAxQ,7178
+clarifai/client/app.py,sha256=UQ1TKYfZu-tYvoyMyEVN0Zsq_Wm_Tl_T70ff1UIjomw,28497
+clarifai/client/base.py,sha256=JXbbjg2CXo8rOdw-XgKWWtLVAhPv3OZua5LFT5w4U2Q,7380
 clarifai/client/dataset.py,sha256=XX-J-9Ict1CQrEycq-JbdxUTuucSgLeDSvnlHE1ucQY,29903
 clarifai/client/input.py,sha256=ZLqa1jGx4NgCbunOTpJxCq4lDQ5xAf4GQ0rsZY8AHCM,44456
 clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
 clarifai/client/model.py,sha256=Q0XEOWaZvSFPx7cLp4xJcwV5SVD1iU_6-DdDJmF-Hfk,72623
 clarifai/client/module.py,sha256=360JaOasX0DZCNE_Trj0LNTr-T_tUDZLfGpz0CdIi78,4248
-clarifai/client/search.py,sha256=iwZqwuEodbjIOEPMIjpic8caFGg3u51RK816pr-574o,14964
-clarifai/client/user.py,sha256=EQTeotfYTNedGcbTICYOUJqKgWhfVHvaMRTJ1hdoIdQ,10372
+clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
+clarifai/client/user.py,sha256=Fr3vDEHieqD7HRRKnlp9h-AIX4AuYBirRYtG4KLwSe8,11836
 clarifai/client/workflow.py,sha256=e3axkhU6c6WcxK9P5tgmnV464k-afslSzsSXx6nSMgA,10560
 clarifai/client/auth/__init__.py,sha256=7EwR0NrozkAUwpUnCsqXvE_p0wqx_SelXlSpKShKJK0,136
 clarifai/client/auth/helper.py,sha256=hqwI7Zlsvivc-O9aAdtxyJT3zkpuMvbxjRaiCTsWYGk,14183
@@ -107,9 +107,9 @@ clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 clarifai/workflows/export.py,sha256=vICRhIreqDSShxLKjHNM2JwzKsf1B4fdXB0ciMcA70k,1945
 clarifai/workflows/utils.py,sha256=nGeB_yjVgUO9kOeKTg4OBBaBz-AwXI3m-huSVj-9W18,1924
 clarifai/workflows/validate.py,sha256=yJq03MaJqi5AK3alKGJJBR89xmmjAQ31sVufJUiOqY8,2556
-clarifai-10.5.4.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-10.5.4.dist-info/METADATA,sha256=y6nmwxvlO3GuzTeIyHPpEPagkFL_lOr_v_ztEIwc1Pg,19372
-clarifai-10.5.4.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-clarifai-10.5.4.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
-clarifai-10.5.4.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-10.5.4.dist-info/RECORD,,
+clarifai-10.7.0.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-10.7.0.dist-info/METADATA,sha256=HGrn1G9zveDMvPIpY76CNRr9i7gp5JhddSicHTNhLCo,19372
+clarifai-10.7.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+clarifai-10.7.0.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
+clarifai-10.7.0.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-10.7.0.dist-info/RECORD,,

{clarifai-10.5.4.dist-info → clarifai-10.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any