clarifai 11.6.7__tar.gz → 11.6.8__tar.gz

{clarifai-11.6.7/clarifai.egg-info → clarifai-11.6.8}/PKG-INFO

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

clarifai-11.6.8/clarifai/__init__.py

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

{clarifai-11.6.7 → clarifai-11.6.8}/clarifai/cli/base.py

@@ -1,4 +1,3 @@
-import getpass
 import json
 import os
 import sys
@@ -82,8 +81,20 @@ def login(ctx, api_url, user_id):
     )
 
     # Securely input PAT
-    pat = getpass.getpass('Enter your Personal Access Token: ')
-
+    pat = input_or_default(
+        'Enter your Personal Access Token (PAT) value (or type "ENVVAR" to use an environment variable): ',
+        'ENVVAR',
+    )
+    if pat.lower() == 'envvar':
+        pat = os.environ.get('CLARIFAI_PAT')
+        if not pat:
+            logger.error(
+                'Environment variable "CLARIFAI_PAT" not set. Please set it in your terminal.'
+            )
+            click.echo(
+                'Aborting login. Please set the environment variable or provide a PAT value and try again.'
+            )
+            click.abort()
     # Progress indicator
     click.echo('\n> Verifying token...')
     validate_context_auth(pat, user_id, api_url)
@@ -152,9 +163,14 @@ def get_contexts(ctx, output_format):
     elif output_format == 'name':
         print('\n'.join(ctx.obj.contexts))
     elif output_format in ('json', 'yaml'):
-        dicts = [v.__dict__ for c, v in ctx.obj.contexts.items()]
-        for d in dicts:
-            d.pop('pat')
+        dicts = []
+        for c, v in ctx.obj.contexts.items():
+            context_dict = {}
+            d = v.to_serializable_dict()
+            d.pop('CLARIFAI_PAT', None)
+            context_dict['name'] = c
+            context_dict['env'] = d
+            dicts.append(context_dict)
         if output_format == 'json':
             print(json.dumps(dicts))
         elif output_format == 'yaml':
@@ -216,6 +232,16 @@ def create_context(
             'personal access token value (default: "ENVVAR" to get our of env var rather than config): ',
             'ENVVAR',
         )
+    if pat.lower() == 'envvar':
+        pat = os.environ.get('CLARIFAI_PAT')
+        if not pat:
+            logger.error(
+                'Environment variable "CLARIFAI_PAT" not set. Please set it in your terminal.'
+            )
+            click.echo(
+                'Aborting context creation. Please set the environment variable or provide a PAT value and try again.'
+            )
+            click.abort()
     validate_context_auth(pat, user_id, base_url)
     context = Context(name, CLARIFAI_USER_ID=user_id, CLARIFAI_API_BASE=base_url, CLARIFAI_PAT=pat)
     ctx.obj.contexts[context.name] = context

{clarifai-11.6.7 → clarifai-11.6.8}/clarifai/cli/model.py

@@ -728,7 +728,11 @@ def local_runner(ctx, model_path, pool_size, verbose):
     model_versions = [v for v in model.list_versions()]
     if len(model_versions) == 0:
         logger.warning("No model versions found. Creating a new version for local runner.")
-        version = model.create_version(pretrained_model_config={"local_dev": True}).model_version
+        # add the signatures for local runner on how to call it.
+        signatures = builder.get_method_signatures(mocking=True)
+        version = model.create_version(
+            pretrained_model_config={"local_dev": True}, method_signatures=signatures
+        ).model_version
         ctx.obj.current.CLARIFAI_MODEL_VERSION_ID = version.id
         ctx.obj.to_yaml()
     else:
@@ -883,30 +887,6 @@ def local_runner(ctx, model_path, pool_size, verbose):
             logger.error(f"Failed to customize Ollama model: {e}")
             raise click.Abort()
 
-    # don't mock for local runner since you need the dependencies to run the code anyways.
-    method_signatures = builder.get_method_signatures(mocking=False)
-
-    from clarifai.runners.utils import code_script
-
-    snippet = code_script.generate_client_script(
-        method_signatures,
-        user_id=user_id,
-        app_id=app_id,
-        model_id=model_id,
-        deployment_id=deployment_id,
-        base_url=ctx.obj.current.api_base,
-    )
-
-    logger.info(f"""\nXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-# About to start up the local runner in this terminal...
-# Here is a code snippet to call this model once it start from another terminal:{snippet}
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-""")
-
-    logger.info(
-        f"Playground: To chat with your model, visit:\n{ctx.obj.current.ui}/playground?model={model.id}__{version.id}&user_id={user_id}&app_id={app_id}"
-    )
-
     logger.info("✅ Starting local runner...")
 
     # This reads the config.yaml from the model_path so we alter it above first.

{clarifai-11.6.7 → clarifai-11.6.8}/clarifai/runners/server.py

@@ -162,7 +162,6 @@ def serve(
                 f"> API URL:      To call your model via the API, use this model URL: {context.ui}/users/{context.user_id}/apps/{context.app_id}/models/{context.model_id}\n"
             )
             logger.info("Press CTRL+C to stop the runner.\n")
-
         runner.start()  # start the runner to fetch work from the API.
 
 

{clarifai-11.6.7 → clarifai-11.6.8/clarifai.egg-info}/PKG-INFO

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

clarifai-11.6.7/clarifai/__init__.py

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