clarifai 11.3.0__tar.gz → 11.3.0rc1__tar.gz

{clarifai-11.3.0/clarifai.egg-info → clarifai-11.3.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: clarifai
-Version: 11.3.0
+Version: 11.3.0rc1
 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>=11.3.2
+Requires-Dist: clarifai-grpc>=11.3.3
 Requires-Dist: clarifai-protocol>=0.0.22
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
@@ -42,7 +42,6 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
-Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

clarifai-11.3.0rc1/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "11.3.0rc1"

{clarifai-11.3.0 → clarifai-11.3.0rc1}/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-11.3.0 → clarifai-11.3.0rc1}/clarifai/runners/utils/data_utils.py

@@ -68,14 +68,14 @@ class InputField(MessageData):
       min_value=None,
       max_value=None,
       choices=None,
-      #  is_param=True
+       is_param=True
   ):
     self.default = default
     self.description = description
     self.min_value = min_value
     self.max_value = max_value
     self.choices = choices
-    # self.is_param = is_param
+    self.is_param = is_param
 
   def __repr__(self) -> str:
     attrs = []
@@ -89,7 +89,7 @@ class InputField(MessageData):
       attrs.append(f"max_value={self.max_value!r}")
     if self.choices is not None:
       attrs.append(f"choices={self.choices!r}")
-    # attrs.append(f"is_param={self.is_param!r}")
+    attrs.append(f"is_param={self.is_param!r}")
     return f"InputField({', '.join(attrs)})"
 
   def to_proto(self, proto=None) -> InputFieldProto:
@@ -112,7 +112,7 @@ class InputField(MessageData):
       if self.max_value is not None:
         range_info.max = float(self.max_value)
       proto.model_type_range_info.CopyFrom(range_info)
-    # proto.is_param = self.is_param
+    proto.is_param = self.is_param
 
     if self.default is not None:
       proto = self.set_default(proto, self.default)
@@ -159,7 +159,7 @@ class InputField(MessageData):
         min_value=min_value,
         max_value=max_value,
         choices=choices,
-        # is_param=proto.is_param
+        is_param=proto.is_param
     )
 
   @classmethod