clarifai 11.1.2__py3-none-any.whl → 11.1.3__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.1.2"
+__version__ = "11.1.3"

clarifai/runners/models/model_builder.py

@@ -30,19 +30,6 @@ dependencies = [
     'torch',
     'clarifai',
 ]
-# Escape dependency names for regex
-dep_pattern = '|'.join(map(re.escape, dependencies))
-# All possible version specifiers
-version_specifiers = '==|>=|<=|!=|~=|>|<'
-# Compile a regex pattern with verbose mode for readability
-pattern = re.compile(r"""
-      ^\s*                                   # Start of line, optional whitespace
-      (?P<dependency>""" + dep_pattern + r""")   # Dependency name
-      \s*                                   # Optional whitespace
-      (?P<specifier>""" + version_specifiers + r""")?  # Optional version specifier
-      \s*                                   # Optional whitespace
-      (?P<version>[^\s;]+)?                 # Optional version (up to space or semicolon)
-      """, re.VERBOSE)
 
 
 def _clear_line(n: int = 1) -> None:
@@ -310,25 +297,41 @@ class ModelBuilder:
     )
     return self.client.STUB.PostModels(request)
 
+  def _match_req_line(self, line):
+    line = line.strip()
+    if not line or line.startswith('#'):
+      return None, None
+    # split on whitespace followed by #
+    line = re.split(r'\s+#', line)[0]
+    if "==" in line:
+      pkg, version = line.split("==")
+    elif ">=" in line:
+      pkg, version = line.split(">=")
+    elif ">" in line:
+      pkg, version = line.split(">")
+    elif "<=" in line:
+      pkg, version = line.split("<=")
+    elif "<" in line:
+      pkg, version = line.split("<")
+    else:
+      pkg, version = line, None  # No version specified
+    for dep in dependencies:
+      if dep == pkg:
+        if dep == 'torch' and line.find(
+            'whl/cpu') > 0:  # Ignore torch-cpu whl files, use base mage.
+          return None, None
+        return dep.strip(), version.strip() if version else None
+    return None, None
+
   def _parse_requirements(self):
     dependencies_version = {}
     with open(os.path.join(self.folder, 'requirements.txt'), 'r') as file:
       for line in file:
         # Skip empty lines and comments
-        line = line.strip()
-        if not line or line.startswith('#'):
+        dependency, version = self._match_req_line(line)
+        if dependency is None:
           continue
-        # split on whitespace followed by #
-        line = re.split(r'\s+#', line)[0]
-        match = pattern.match(line)
-        if match:
-          dependency = match.group('dependency')
-          version = match.group('version')
-          if dependency == "torch" and line.find(
-              'whl/cpu') > 0:  # Ignore torch-cpu whl files, use base mage.
-            continue
-
-          dependencies_version[dependency] = version if version else None
+        dependencies_version[dependency] = version if version else None
     return dependencies_version
 
   def create_dockerfile(self):
@@ -395,10 +398,8 @@ class ModelBuilder:
       with open(os.path.join(self.folder, 'requirements.txt'), 'r') as file:
         for line in file:
           # if the line without whitespace is "clarifai"
-          # split on whitespace followed by #
-          matchline = re.split(r'\s+#', line)[0]
-          match = pattern.match(matchline)
-          if match and match.group('dependency') == "clarifai":
+          dependency, version = self._match_req_line(line)
+          if dependency and dependency == "clarifai":
             lines.append(line.replace("clarifai", f"clarifai=={CLIENT_VERSION}"))
           else:
             lines.append(line)

clarifai/runners/models/model_run_locally.py

@@ -475,7 +475,7 @@ def main(model_path,
          keep_env=False,
          keep_image=False):
 
-  if not os.environ['CLARIFAI_PAT']:
+  if not os.environ.get("CLARIFAI_PAT", None):
     logger.error(
         "CLARIFAI_PAT environment variable is not set! Please set your PAT in the 'CLARIFAI_PAT' environment variable."
     )

{clarifai-11.1.2.dist-info → clarifai-11.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clarifai
-Version: 11.1.2
+Version: 11.1.3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

{clarifai-11.1.2.dist-info → clarifai-11.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=fV9IcJ-zGS4X0kN6R9n392l7oHE6doud1Q_KeRhK07A,23
+clarifai/__init__.py,sha256=zXnN8vTFtOShwHlre_qBxRyaLcXDT3l9V0CuoZEkV5Y,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -66,9 +66,9 @@ clarifai/runners/server.py,sha256=Wp3bUHNudFV3Ew2egU7X6f3TCTbBgV__15Rw2yd9jY0,36
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=oY_1aOYxQm9XdrV31PfMHGZIQKqEvTJDhPRTIR8Tr4o,3091
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/models/base_typed_model.py,sha256=0QCWxch8CcyJSKvE1D4PILd2RSnQZHTmx4DXlQQ6dpo,7856
-clarifai/runners/models/model_builder.py,sha256=fw1w_Grcsti1wob4IUdyF68t_vpzhoZJ9nkiFFh7S98,29798
+clarifai/runners/models/model_builder.py,sha256=R5Otrr3Pxn409k8Tlam8I50LM_wohJcfWX8_NlLHzV4,29461
 clarifai/runners/models/model_class.py,sha256=9JSPAr4U4K7xI0kSl-q0mHB06zknm2OR-8XIgBCto94,1611
-clarifai/runners/models/model_run_locally.py,sha256=v-Ak05BK42HUy_cyNrWvd6crOORcOTTOHbzoVjHFtkA,20553
+clarifai/runners/models/model_run_locally.py,sha256=MGfWe0_IO6OMc8CRD8HpVDUKX7spcFVU6wXukml4OXs,20563
 clarifai/runners/models/model_runner.py,sha256=PyxwK-33hLlhkD07tTXkjWZ_iNlZHl9_8AZ2W7WfExI,6097
 clarifai/runners/models/model_servicer.py,sha256=jtQmtGeQlvQ5ttMvVw7CMnNzq-rLkTaxR2IWF9SnHwk,2808
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -93,9 +93,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-11.1.2.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.1.2.dist-info/METADATA,sha256=v77LGbX30zXJg-DSOE-soNNttZXaNdmJqN-DRlCXaLU,22419
-clarifai-11.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-clarifai-11.1.2.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.1.2.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.1.2.dist-info/RECORD,,
+clarifai-11.1.3.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.1.3.dist-info/METADATA,sha256=5ZiW5qdV2Gh6wwxOgt_Sm_XToJRMmZgoerv-xWpYOPA,22419
+clarifai-11.1.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+clarifai-11.1.3.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.1.3.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.1.3.dist-info/RECORD,,