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

clarifai/__init__.py

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

clarifai/client/app.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, Generator, List
 
 import yaml
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
-from clarifai_grpc.grpc.api.resources_pb2 import Concept
+from clarifai_grpc.grpc.api.resources_pb2 import Concept, ConceptRelation
 from clarifai_grpc.grpc.api.status import status_code_pb2
 from google.protobuf.json_format import MessageToDict
 
@@ -19,7 +19,9 @@ from clarifai.client.workflow import Workflow
 from clarifai.constants.model import TRAINABLE_MODEL_TYPES
 from clarifai.errors import UserError
 from clarifai.urls.helper import ClarifaiUrlHelper
-from clarifai.utils.logging import display_workflow_tree, get_logger
+from clarifai.utils.logging import (display_concept_relations_tree, display_workflow_tree,
+                                    get_logger)
+from clarifai.utils.misc import concept_relations_accumulation
 from clarifai.workflows.utils import get_yaml_output_info_proto, is_same_yaml_model
 from clarifai.workflows.validate import validate
 
@@ -258,6 +260,26 @@ class App(Lister, BaseClient):
       yield Module.from_auth_helper(
           auth=self.auth_helper, module_id=imv_info['module_version']['module_id'], **imv_info)
 
+  def get_input_count(self) -> int:
+    """Get count of all the inputs in the app.
+
+    Returns:
+        input_count: count of inputs in the app.
+
+    Example:
+        >>> from clarifai.client.app import App
+        >>> app = App(app_id="app_id", user_id="user_id")
+        >>> input_count = app.get_input_count()
+    """
+    request = service_pb2.GetInputCountRequest(user_app_id=self.user_app_id)
+    response = self._grpc_request(self.STUB.GetInputCount, request)
+
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nGetting App input Counts\n%s", response.status)
+
+    return response.counts.processed
+
   def list_concepts(self, page_no: int = None,
                     per_page: int = None) -> Generator[Concept, None, None]:
     """Lists all the concepts for the app.
@@ -288,6 +310,53 @@ class App(Lister, BaseClient):
       concept_info['id'] = concept_info.pop('concept_id')
       yield Concept(**concept_info)
 
+  def search_concept_relations(self,
+                               concept_id: str = None,
+                               predicate: str = None,
+                               page_no: int = None,
+                               per_page: int = None,
+                               show_tree: bool = False) -> Generator[ConceptRelation, None, None]:
+    """List all the concept relations of the app.
+
+    Args:
+        concept_id (str, optional): The concept ID to filter the concept relations.
+        predicate (str, optional): Type of relation to filter the concept relations. For ex : 'hypernym', 'hyponym' or 'synonym'
+        page_no (int, optional): The page number to list.
+        per_page (int, optional): The number of items per page.
+        show_tree (bool, optional): If True, prints out rich tree representation of concept relations.
+
+    Yields:
+        ConceptRelation: ConceptRelations in the app.
+
+    Example:
+        >>> from clarifai.client.app import App
+        >>> app = App(app_id="app_id", user_id="user_id")
+        >>> all_concept_relations = list(app.search_concept_relations())
+
+    Note:
+        Defaults to 16 per page if page_no is specified and per_page is not specified.
+        If both page_no and per_page are None, then lists all the resources.
+    """
+    request_data = dict(user_app_id=self.user_app_id, concept_id=concept_id, predicate=predicate)
+    all_concept_relations_infos = self.list_pages_generator(
+        self.STUB.ListConceptRelations,
+        service_pb2.ListConceptRelationsRequest,
+        request_data,
+        per_page=per_page,
+        page_no=page_no)
+    relations_dict = {}
+    for concept_relation_info in all_concept_relations_infos:
+      if show_tree:
+        current_subject_concept = concept_relation_info['subject_concept']['id']
+        current_object_concept = concept_relation_info['object_concept']['id']
+        current_predicate = concept_relation_info['predicate']
+        relations_dict = concept_relations_accumulation(relations_dict, current_subject_concept,
+                                                        current_object_concept, current_predicate)
+      concept_relation_info['id'] = concept_relation_info.pop('concept_relation_id')
+      yield ConceptRelation(**concept_relation_info)
+    if show_tree:
+      display_concept_relations_tree(relations_dict)
+
   def list_trainable_model_types(self) -> List[str]:
     """Lists all the trainable model types.
 
@@ -352,33 +421,12 @@ class App(Lister, BaseClient):
 
     return Model.from_auth_helper(auth=self.auth_helper, **kwargs)
 
-  def create_workflow(self,
-                      config_filepath: str,
-                      generate_new_id: bool = False,
-                      display: bool = True) -> Workflow:
-    """Creates a workflow for the app.
-
-    Args:
-        config_filepath (str): The path to the yaml workflow config file.
-        generate_new_id (bool): If True, generate a new workflow ID.
-        display (bool): If True, display the workflow nodes tree.
-
-    Returns:
-        Workflow: A Workflow object for the specified workflow config.
-
-    Example:
-        >>> from clarifai.client.app import App
-        >>> app = App(app_id="app_id", user_id="user_id")
-        >>> workflow = app.create_workflow(config_filepath="config.yml")
-    """
-    if not os.path.exists(config_filepath):
-      raise UserError(f"Workflow config file not found at {config_filepath}")
-
+  def _process_workflow_config(self, config_filepath: str):
     with open(config_filepath, 'r') as file:
-      data = yaml.safe_load(file)
+      workflow_config = yaml.safe_load(file)
 
-    data = validate(data)
-    workflow = data['workflow']
+    workflow_config = validate(workflow_config)
+    workflow = workflow_config['workflow']
 
     # Get all model objects from the workflow nodes.
     all_models = []
@@ -420,6 +468,32 @@ class App(Lister, BaseClient):
           node.node_inputs.append(resources_pb2.NodeInput(node_id=ni['node_id']))
       nodes.append(node)
 
+    return workflow, nodes
+
+  def create_workflow(self,
+                      config_filepath: str,
+                      generate_new_id: bool = False,
+                      display: bool = True) -> Workflow:
+    """Creates a workflow for the app.
+
+    Args:
+        config_filepath (str): The path to the yaml workflow config file.
+        generate_new_id (bool): If True, generate a new workflow ID.
+        display (bool): If True, display the workflow nodes tree.
+
+    Returns:
+        Workflow: A Workflow object for the specified workflow config.
+
+    Example:
+        >>> from clarifai.client.app import App
+        >>> app = App(app_id="app_id", user_id="user_id")
+        >>> workflow = app.create_workflow(config_filepath="config.yml")
+    """
+    if not os.path.exists(config_filepath):
+      raise UserError(f"Workflow config file not found at {config_filepath}")
+
+    workflow, nodes = self._process_workflow_config(config_filepath)
+
     workflow_id = workflow['id']
     if generate_new_id:
       workflow_id = str(uuid.uuid4())
@@ -470,6 +544,60 @@ class App(Lister, BaseClient):
 
     return Module.from_auth_helper(auth=self.auth_helper, module_id=module_id, **kwargs)
 
+  def create_concepts(self, concept_ids: List[str], concepts: List[str] = []) -> None:
+    """Add concepts to the app.
+
+    Args:
+        concept_ids (List[str]): List of concept IDs of concepts to add to the app.
+        concepts (List[str], optional): List of concepts names of concepts to add to the app.
+
+    Example:
+        >>> from clarifai.client.app import App
+        >>> app = App(app_id="app_id", user_id="user_id")
+        >>> app.add_concepts(concept_ids=["concept_id_1", "concept_id_2", ..])
+    """
+    if not concepts:
+      concepts = list(concept_ids)
+    concepts_to_add = [
+        resources_pb2.Concept(id=concept_id, name=concept)
+        for concept_id, concept in zip(concept_ids, concepts)
+    ]
+    request = service_pb2.PostConceptsRequest(
+        user_app_id=self.user_app_id, concepts=concepts_to_add)
+    response = self._grpc_request(self.STUB.PostConcepts, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nConcepts added\n%s", response.status)
+
+  def create_concept_relations(self, subject_concept_id: str, object_concept_ids: List[str],
+                               predicates: List[str]) -> None:
+    """Creates concept relations between concepts of the app.
+
+    Args:
+        subject_concept_id (str): The concept ID of the subject concept.
+        object_concept_ids (List[str]): List of concepts IDs of object concepts.
+        predicates (List[str]): List of predicates corresponding to each relation between subject and objects.
+
+    Example:
+        >>> from clarifai.client.app import App
+        >>> app = App(app_id="app_id", user_id="user_id")
+        >>> app.create_concept_relation(subject_concept_id="subject_concept_id", object_concept_ids=["object_concept_id_1", "object_concept_id_2", ..], predicates=["predicate_1", "predicate_2", ..])
+    """
+    assert len(object_concept_ids) == len(predicates)
+    subject_relations = [
+        resources_pb2.ConceptRelation(
+            object_concept=resources_pb2.Concept(id=object_concept_id), predicate=predicate)
+        for object_concept_id, predicate in zip(object_concept_ids, predicates)
+    ]
+    request = service_pb2.PostConceptRelationsRequest(
+        user_app_id=self.user_app_id,
+        concept_id=subject_concept_id,
+        concept_relations=subject_relations)
+    response = self._grpc_request(self.STUB.PostConceptRelations, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nConcept Relations created\n%s", response.status)
+
   def dataset(self, dataset_id: str, dataset_version_id: str = None, **kwargs) -> Dataset:
     """Returns a Dataset object for the existing dataset ID.
 
@@ -592,6 +720,100 @@ 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 patch_model(self, model_id: str, action: str = 'merge', **kwargs) -> Model:
+    """Patches a model of the app.
+
+    Args:
+        model_id (str): The model ID of the model to patch.
+        action (str): The action to perform on the model (merge/overwrite/remove).
+        **kwargs: Additional keyword arguments to be passed to patch the Model.
+
+    Returns:
+        Model: A Model object of the specified model 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.PatchModelsRequest(
+        user_app_id=self.user_app_id,
+        models=[resources_pb2.Model(id=model_id, **kwargs)],
+        action=action)
+    response = self._grpc_request(self.STUB.PatchModels, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nModel %s patched successfully\n%s", model_id, response.status)
+    kwargs.update({
+        'model_id': model_id,
+    })
+
+    return Model.from_auth_helper(self.auth_helper, **kwargs)
+
+  def patch_workflow(self,
+                     workflow_id: str,
+                     action: str = 'merge',
+                     config_filepath: str = None,
+                     **kwargs) -> Workflow:
+    """Patches a workflow of the app.
+
+    Args:
+        workflow_id (str): The Workflow ID of the workflow to patch.
+        action (str): The action to perform on the workflow (merge/overwrite/remove).
+        config_filepath (str): The path to the yaml workflow config file.
+        **kwargs: Additional keyword arguments to be passed to patch the Workflow.
+
+    Returns:
+        Workflow: A Workflow object of the specified workflow ID.
+    """
+    if config_filepath:
+      if not os.path.exists(config_filepath):
+        raise UserError(f"Workflow config file not found at {config_filepath}")
+      _, kwargs['nodes'] = self._process_workflow_config(config_filepath)
+    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.PatchWorkflowsRequest(
+        user_app_id=self.user_app_id,
+        workflows=[resources_pb2.Workflow(id=workflow_id, **kwargs)],
+        action=action)
+    response = self._grpc_request(self.STUB.PatchWorkflows, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nWorkflow patched\n%s", response.status)
+    kwargs.update({
+        'workflow_id': workflow_id,
+    })
+
+    return Workflow.from_auth_helper(self.auth_helper, **kwargs)
+
   def delete_dataset(self, dataset_id: str) -> None:
     """Deletes an dataset for the user.
 
@@ -665,6 +887,31 @@ class App(Lister, BaseClient):
       raise Exception(response.status)
     self.logger.info("\nModule Deleted\n%s", response.status)
 
+  def delete_concept_relations(self, concept_id: str,
+                               concept_relation_ids: List[str] = []) -> None:
+    """Delete concept relations of a concept of the app.
+
+    Args:
+        concept_id (str): The concept ID of the concept to delete relations for.
+        concept_relation_ids (List[str], optional): List of concept relation IDs of concept relations.
+
+    Example:
+        >>> from clarifai.client.app import App
+        >>> app = App(app_id="app_id", user_id="user_id")
+        >>> app.delete_concept_relations(concept_id="concept_id", concept_relation_ids=["concept_relation_id_1", "concept_relation_id_2", ..])
+    """
+    if not concept_relation_ids:
+      concept_relation_ids = [
+          concept_relation.id
+          for concept_relation in list(self.search_concept_relations(concept_id=concept_id))
+      ]
+    request = service_pb2.DeleteConceptRelationsRequest(
+        user_app_id=self.user_app_id, concept_id=concept_id, ids=concept_relation_ids)
+    response = self._grpc_request(self.STUB.DeleteConceptRelations, request)
+    if response.status.code != status_code_pb2.SUCCESS:
+      raise Exception(response.status)
+    self.logger.info("\nConcept Relations Deleted\n%s", response.status)
+
   def search(self, **kwargs) -> Model:
     """Returns a Search object for the user and app ID.
 

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/model.py

@@ -11,6 +11,7 @@ from clarifai_grpc.grpc.api.resources_pb2 import Input
 from clarifai_grpc.grpc.api.status import status_code_pb2
 from google.protobuf.json_format import MessageToDict
 from google.protobuf.struct_pb2 import Struct, Value
+from requests.adapters import HTTPAdapter, Retry
 from tqdm import tqdm
 
 from clarifai.client.base import BaseClient
@@ -1295,7 +1296,11 @@ class Model(Lister, BaseClient):
       model_export_url = get_model_export_response.export.url
       model_export_file_size = get_model_export_response.export.size
 
-      response = requests.get(model_export_url, stream=True)
+      session = requests.Session()
+      retries = Retry(total=10, backoff_factor=1, status_forcelist=[500, 502, 503, 504])
+      session.mount('https://', HTTPAdapter(max_retries=retries))
+      session.headers.update({'Authorization': self.metadata[0][1]})
+      response = session.get(model_export_url, stream=True)
       response.raise_for_status()
 
       with open(local_filepath, 'wb') as f:

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/datasets/export/inputs_annotations.py

@@ -196,7 +196,7 @@ class InputAnnotationDownloader:
 
     if data_dict.get("concepts") or data_dict.get("regions"):
       file_name = os.path.join(split, "annotations", input_.id + ".json")
-      annot_data = data_dict.get("concepts") or data_dict.get("regions")
+      annot_data = data_dict.get("regions", []) + data_dict.get("concepts")
 
       self._save_annotation_to_archive(new_archive, annot_data, file_name)
       self.num_annotations += 1

clarifai/utils/logging.py

@@ -1,6 +1,6 @@
 import logging
 from collections import defaultdict
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from rich import print as rprint
 from rich.console import Console
@@ -138,3 +138,16 @@ def process_log_files(log_file_path: str,) -> tuple:
     return [], []
 
   return duplicate_input_ids, failed_input_ids
+
+
+def display_concept_relations_tree(relations_dict: Dict[str, Any]) -> None:
+  """Print all the concept relations of the app in rich tree format.
+
+    Args:
+        relations_dict (dict): A dict of concept relations info.
+    """
+  for parent, children in relations_dict.items():
+    tree = Tree(parent)
+    for child in children:
+      tree.add(child)
+    rprint(tree)

clarifai/utils/misc.py

@@ -1,5 +1,5 @@
 import os
-from typing import List
+from typing import Any, Dict, List
 
 from clarifai.errors import UserError
 
@@ -46,3 +46,26 @@ def get_from_env(key: str, env_key: str) -> str:
     raise UserError(f"Did not find `{key}`, please add an environment variable"
                     f" `{env_key}` which contains it, or pass"
                     f"  `{key}` as a named parameter.")
+
+
+def concept_relations_accumulation(relations_dict: Dict[str, Any], subject_concept: str,
+                                   object_concept: str, predicate: str) -> Dict[str, Any]:
+  """Append the concept relation to relations dict based on its predicate.
+
+    Args:
+        relations_dict (dict): A dict of concept relations info.
+    """
+  if predicate == 'hyponym':
+    if object_concept in relations_dict:
+      relations_dict[object_concept].append(subject_concept)
+    else:
+      relations_dict[object_concept] = [subject_concept]
+  elif predicate == 'hypernym':
+    if subject_concept in relations_dict:
+      relations_dict[subject_concept].append(object_concept)
+    else:
+      relations_dict[subject_concept] = [object_concept]
+  else:
+    relations_dict[object_concept] = []
+    relations_dict[subject_concept] = []
+  return relations_dict

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.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.5.4
+Version: 10.8.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.8.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.8.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-clarifai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/__init__.py,sha256=x_bDnpR_W5o1ETeLzxk1ahCDd3RSOmf0Fs_F69i8AEo,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=mAUtG5ucNC_MJdyDZi99ttP7R3Tffm6Qp7DahOYo_fE,38531
+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/model.py,sha256=TsIiId2a1eqR8Ct83f8KbqBsxiDT9XNPxqLSQtr3i1A,72930
 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
@@ -25,7 +25,7 @@ clarifai/constants/search.py,sha256=yYEqTaFg-KdnpJE_Ytp-EPVHIIC395iNtZrpVlLIf4o,
 clarifai/constants/workflow.py,sha256=cECq1xdvf44MCdtK2AbkiuuwhyL-6OWZdQfYbsLKy_o,33
 clarifai/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/datasets/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/datasets/export/inputs_annotations.py,sha256=Mzo7UMoxuOvgLSmkU9e6WvSCGLPIa6NXKuQHyesVLG8,9737
+clarifai/datasets/export/inputs_annotations.py,sha256=X1Y1XjnJrPrlwqv2aM4a1mBPUpWgEpz5stq2Vq-mLaM,9740
 clarifai/datasets/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/datasets/upload/base.py,sha256=IP4sdBRfThk2l0W1rDWciFrAJnKwVsM-gu4zEslJ2_E,2198
 clarifai/datasets/upload/features.py,sha256=oq0PGpAw8LEafiSkdMMl0yn-NJeZ7K_CKzpJ71b0H40,1731
@@ -96,8 +96,8 @@ clarifai/schema/search.py,sha256=JjTi8ammJgZZ2OGl4K6tIA4zEJ1Fr2ASZARXavI1j5c,244
 clarifai/urls/helper.py,sha256=tjoMGGHuWX68DUB0pk4MEjrmFsClUAQj2jmVEM_Sy78,4751
 clarifai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/utils/constants.py,sha256=MG_iHnSwNEyUZOpvsrTicNwaT4CIjmlK_Ixk_qqEX8g,142
-clarifai/utils/logging.py,sha256=sR_pRfSHZvHb08KcduAGz9oFrzioWqqCDZ3mHB8rpUY,4601
-clarifai/utils/misc.py,sha256=GznzquXXFt8J9qzMWtTJPFWCSc5QTs_ZBldW1mXCZzE,1285
+clarifai/utils/logging.py,sha256=ubo_knWpCmlXmt6uKAYppIQef1IcwPUJdqeqwjxe3RI,4977
+clarifai/utils/misc.py,sha256=WV3KGM5_MwHySVthjUK4O93x6F_kE1h3-xT4zE4EvnU,2150
 clarifai/utils/model_train.py,sha256=Mndqy5GNu7kjQHjDyNVyamL0hQFLGSHcWhOuPyOvr1w,8005
 clarifai/utils/evaluation/__init__.py,sha256=PYkurUrXrGevByj7RFb6CoU1iC7fllyQSfnnlo9WnY8,69
 clarifai/utils/evaluation/helpers.py,sha256=d_dcASRI_lhsHIRukAF1S-w7XazLpK9y6E_ug3l50t4,18440
@@ -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.8.0.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-10.8.0.dist-info/METADATA,sha256=4oERpF1zh5aLZU6ZUh4jh6XqXyl-4n9pnle4KlbwBOM,19372
+clarifai-10.8.0.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+clarifai-10.8.0.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
+clarifai-10.8.0.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-10.8.0.dist-info/RECORD,,

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

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