clarifai 11.5.1__tar.gz → 11.5.2__tar.gz

{clarifai-11.5.1/clarifai.egg-info → clarifai-11.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.5.1
+Version: 11.5.2
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com

clarifai-11.5.2/clarifai/__init__.py

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

{clarifai-11.5.1 → clarifai-11.5.2}/clarifai/cli/model.py

@@ -520,6 +520,10 @@ def local_dev(ctx, model_path):
 
         try:
             runner = nodepool.runner(runner_id)
+            # ensure the deployment is using the latest version.
+            if runner.worker.model.model_version.id != version.id:
+                nodepool.delete_runners([runner_id])
+                raise AttributeError("Deleted runner that was for an old model version ID.")
         except Exception as e:
             raise AttributeError("Runner not found in nodepool.") from e
     except AttributeError:
@@ -549,6 +553,10 @@ def local_dev(ctx, model_path):
         deployment_id = DEFAULT_LOCAL_DEV_DEPLOYMENT_ID
     try:
         deployment = nodepool.deployment(deployment_id)
+        # ensure the deployment is using the latest version.
+        if deployment.worker.model.model_version.id != version.id:
+            nodepool.delete_deployments([deployment_id])
+            raise Exception("Deleted deployment that was for an old model version ID.")
         try:
             deployment_id = ctx.obj.current.deployment_id
         except AttributeError:  # doesn't exist in context but does in API then update the context.
@@ -576,6 +584,7 @@ def local_dev(ctx, model_path):
                             },
                         }
                     ],
+                    "deploy_latest_version": True,
                 }
             },
         )

{clarifai-11.5.1 → clarifai-11.5.2}/clarifai/client/auth/helper.py

@@ -1,7 +1,6 @@
 import os
 import urllib.request
 from typing import Any, Dict
-from urllib.parse import urlparse
 
 from clarifai_grpc.channel.clarifai_channel import ClarifaiChannel
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2_grpc
@@ -42,28 +41,31 @@ def https_cache(cache: dict, url: str) -> str:
     elif url.startswith("http://"):
         url = url.replace("http://", "")
         cache[url] = HTTP
-    elif url not in cache:
+    elif url.endswith(":443"):
+        # If it ends with :443 then we know it's https.
+        # trim it off the right
+        url = url[:-4]
+        cache[url] = HTTPS
+    elif url.find('.clarifai.com') >= 0:
         # We know our endpoints are https.
-        host_name = urlparse(url).hostname
-        if host_name and host_name.endswith(".clarifai.com"):
-            cache[url] = HTTPS
-        else:  # need to test it.
-            try:  # make request to https endpoint.
-                urllib.request.urlopen("https://%s/v2/auth/methods" % url, timeout=1)
-                cache[url] = HTTPS  # cache it.
-            except Exception as e:
-                if "SSL" in str(e):  # if ssl error then we know it's http.
-                    cache[url] = HTTP
-                    # For http urls we need host:port format.
-                    if ":" not in url:
-                        raise Exception(
-                            "When providing an insecure url it must have both host:port format"
-                        )
-                else:
+        cache[url] = HTTPS
+    elif url not in cache:
+        # need to test ones that we don't have in the cache yet.
+        try:  # make request to https endpoint.
+            urllib.request.urlopen("https://%s/v2/auth/methods" % url, timeout=5)
+            cache[url] = HTTPS  # cache it.
+        except Exception as e:
+            if "SSL" in str(e):  # if ssl error then we know it's http.
+                cache[url] = HTTP
+                # For http urls we need host:port format.
+                if ":" not in url:
                     raise Exception(
-                        "Could not get a valid response from url: %s, is the API running there?"
-                        % url
-                    ) from e
+                        "When providing an insecure url it must have both host:port format"
+                    )
+            else:
+                raise Exception(
+                    "Could not get a valid response from url: %s, is the API running there?" % url
+                ) from e
     return url
 
 

{clarifai-11.5.1 → clarifai-11.5.2/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.5.1
+Version: 11.5.2
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com

{clarifai-11.5.1 → clarifai-11.5.2}/tests/test_auth.py

@@ -22,6 +22,14 @@ def test_ui_default_url():
     (
         ("http://localhost:3002", "http://localhost:3002"),
         ("https://localhost:3002", "https://localhost:3002"),
+        ("https://localhost", "https://localhost"),
+        ("http://localhost", "http://localhost"),
+        ("http://10.4.5.6", "http://10.4.5.6"),
+        ("http://10.5.6.7", "http://10.5.6.7"),
+        ("10.5.6.7:443", "https://10.5.6.7"),
+        ("http://10.5.6.7:443", "http://10.5.6.7:443"),
+        ("something.clarifai.com", "https://something.clarifai.com"),
+        ("something.clarifai.com:443", "https://something.clarifai.com"),
         ("https://clarifai.com", "https://clarifai.com"),
     ),
 )
@@ -39,6 +47,15 @@ def test_passing_no_schema_url_use_https_when_server_is_running():
         assert helper.ui == "https://server"
 
 
+def test_passing_no_schema_url_detect_http_when_SSL_in_error():
+    def raise_exception():
+        return Mock(side_effect=Exception("Has SSL in error"))
+
+    with mock.patch('urllib.request.urlopen', new_callable=raise_exception):
+        helper = ClarifaiAuthHelper("clarifai", "main", "fake_pat", ui="localhost:3002")
+        assert helper.ui == "http://localhost:3002"
+
+
 def test_passing_no_schema_url_show_error_when_not_server_running():
     def raise_exception():
         return Mock(side_effect=Exception("http_exception"))
@@ -51,15 +68,6 @@ def test_passing_no_schema_url_show_error_when_not_server_running():
             ClarifaiAuthHelper("clarifai", "main", "fake_pat", ui="localhost:3002")
 
 
-def test_passing_no_schema_url_detect_http_when_SSL_in_error():
-    def raise_exception():
-        return Mock(side_effect=Exception("Has SSL in error"))
-
-    with mock.patch('urllib.request.urlopen', new_callable=raise_exception):
-        helper = ClarifaiAuthHelper("clarifai", "main", "fake_pat", ui="localhost:3002")
-        assert helper.ui == "http://localhost:3002"
-
-
 def test_passing_no_schema_url_require_port():
     def raise_exception():
         return Mock(side_effect=Exception("Has SSL in error"))

clarifai-11.5.1/clarifai/__init__.py

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