clarifai 11.2.4rc3__py3-none-any.whl → 11.3.0rc1__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.2.4rc3"
+__version__ = "11.3.0rc1"

clarifai/client/deployment.py

@@ -3,6 +3,7 @@ from clarifai_grpc.grpc.api import resources_pb2
 from clarifai.client.base import BaseClient
 from clarifai.client.lister import Lister
 from clarifai.utils.logging import logger
+from clarifai.utils.protobuf import dict_to_protobuf
 
 
 class Deployment(Lister, BaseClient):
@@ -28,7 +29,8 @@ class Deployment(Lister, BaseClient):
         **kwargs: Additional keyword arguments to be passed to the deployment.
     """
     self.kwargs = {**kwargs, 'id': deployment_id, 'user_id': user_id}
-    self.deployment_info = resources_pb2.Deployment(**self.kwargs)
+    self.deployment_info = resources_pb2.Deployment()
+    dict_to_protobuf(self.deployment_info, self.kwargs)
     self.logger = logger
     BaseClient.__init__(
         self,

clarifai/client/model.py

@@ -32,7 +32,7 @@ from clarifai.utils.misc import BackoffIterator
 from clarifai.utils.model_train import (find_and_replace_key, params_parser,
                                         response_to_model_params, response_to_param_info,
                                         response_to_templates)
-
+from clarifai.utils.protobuf import dict_to_protobuf
 MAX_SIZE_PER_STREAM = int(89_128_960)  # 85GiB
 MIN_CHUNK_FOR_UPLOAD_FILE = int(5_242_880)  # 5MiB
 MAX_CHUNK_FOR_UPLOAD_FILE = int(5_242_880_000)  # 5GiB
@@ -73,8 +73,11 @@ class Model(Lister, BaseClient):
       user_id, app_id, _, model_id, model_version_id = ClarifaiUrlHelper.split_clarifai_url(url)
       model_version = {'id': model_version_id}
       kwargs = {'user_id': user_id, 'app_id': app_id}
+
     self.kwargs = {**kwargs, 'id': model_id, 'model_version': model_version, }
-    self.model_info = resources_pb2.Model(**self.kwargs)
+    self.model_info = resources_pb2.Model()
+    dict_to_protobuf(self.model_info, self.kwargs)
+
     self.logger = logger
     self.training_params = {}
     self.input_types = None
@@ -983,7 +986,8 @@ class Model(Lister, BaseClient):
 
     dict_response = MessageToDict(response, preserving_proto_field_name=True)
     self.kwargs = self.process_response_keys(dict_response['model'])
-    self.model_info = resources_pb2.Model(**self.kwargs)
+    self.model_info = resources_pb2.Model()
+    dict_to_protobuf(self.model_info, self.kwargs)
 
   def __str__(self):
     if len(self.kwargs) < 10:

clarifai/runners/models/model_builder.py

@@ -43,6 +43,19 @@ def _clear_line(n: int = 1) -> None:
     print(LINE_UP, end=LINE_CLEAR, flush=True)
 
 
+def is_related(object_class, main_class):
+  # Check if the object_class is a subclass of main_class
+  if issubclass(object_class, main_class):
+    return True
+
+  # Check if the object_class is a subclass of any of the parent classes of main_class
+  parent_classes = object_class.__bases__
+  for parent in parent_classes:
+    if main_class in parent.__bases__:
+      return True
+  return False
+
+
 class ModelBuilder:
   DEFAULT_CHECKPOINT_SIZE = 50 * 1024**3  # 50 GiB
 
@@ -125,7 +138,7 @@ class ModelBuilder:
     # Find all classes in the model.py file that are subclasses of ModelClass
     classes = [
         cls for _, cls in inspect.getmembers(module, inspect.isclass)
-        if issubclass(cls, ModelClass) and cls.__module__ == module.__name__
+        if is_related(cls, ModelClass) and cls.__module__ == module.__name__
     ]
     #  Ensure there is exactly one subclass of BaseRunner in the model.py file
     if len(classes) != 1:

clarifai/runners/models/model_class.py

@@ -1,3 +1,4 @@
+import collections.abc as abc
 import inspect
 import itertools
 import logging
@@ -271,8 +272,9 @@ class ModelClass(ABC):
         if k not in python_param_types:
           continue
 
-        if hasattr(python_param_types[k], "__args__") and getattr(python_param_types[k],
-                                                                  "__origin__", None) == Iterator:
+        if hasattr(python_param_types[k],
+                   "__args__") and (getattr(python_param_types[k], "__origin__",
+                                            None) in [abc.Iterator, abc.Generator, abc.Iterable]):
           # get the type of the items in the stream
           stream_type = python_param_types[k].__args__[0]