clarifai 11.1.7rc3__tar.gz → 11.2.1__tar.gz

{clarifai-11.1.7rc3/clarifai.egg-info → clarifai-11.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: clarifai
-Version: 11.1.7rc3
+Version: 11.2.1
 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.2.4
+Requires-Dist: clarifai-grpc>=11.2.6
 Requires-Dist: clarifai-protocol>=0.0.20
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
@@ -32,9 +32,21 @@ Requires-Dist: tabulate>=0.9.0
 Requires-Dist: fsspec>=2024.6.1
 Requires-Dist: click>=8.1.7
 Requires-Dist: requests>=2.32.3
-Requires-Dist: aiohttp>=3.8.1
+Requires-Dist: aiohttp>=3.10.0
 Provides-Extra: all
 Requires-Dist: pycocotools==2.0.6; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h1 align="center">
   <a href="https://www.clarifai.com/"><img alt="Clarifai" title="Clarifai" src="https://github.com/user-attachments/assets/623b883b-7fe5-4b95-bbfa-8691f5779af4"></a>

clarifai-11.2.1/clarifai/__init__.py

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

{clarifai-11.1.7rc3 → clarifai-11.2.1}/clarifai/cli/base.py

@@ -2,7 +2,8 @@ import os
 
 import click
 
-from ..utils.cli import dump_yaml, from_yaml, load_command_modules, set_base_url
+from clarifai.utils.cli import dump_yaml, from_yaml, load_command_modules, set_base_url
+from clarifai.utils.logging import logger
 
 
 class CustomMultiGroup(click.Group):
@@ -41,7 +42,7 @@ class CustomMultiGroup(click.Group):
 def cli(ctx):
   """Clarifai CLI"""
   ctx.ensure_object(dict)
-  config_path = 'config.yaml'
+  config_path = f"{os.getenv('HOME')}/.clarifai/config.yaml"
   if os.path.exists(config_path):
     ctx.obj = from_yaml(config_path)
   else:
@@ -66,16 +67,16 @@ def login(ctx, config, env, user_id):
 
   if 'pat' in ctx.obj:
     os.environ["CLARIFAI_PAT"] = ctx.obj['pat']
-    click.echo("Loaded PAT from config file.")
+    logger.info("Loaded PAT from config file.")
   elif 'CLARIFAI_PAT' in os.environ:
     ctx.obj['pat'] = os.environ["CLARIFAI_PAT"]
-    click.echo("Loaded PAT from environment variable.")
+    logger.info("Loaded PAT from environment variable.")
   else:
     _pat = click.prompt(
         "Get your PAT from https://clarifai.com/settings/security and pass it here", type=str)
     os.environ["CLARIFAI_PAT"] = _pat
     ctx.obj['pat'] = _pat
-    click.echo("PAT saved successfully.")
+    logger.info("PAT saved successfully.")
 
   if user_id:
     ctx.obj['user_id'] = user_id
@@ -89,7 +90,7 @@ def login(ctx, config, env, user_id):
     user_id = click.prompt("Pass the User ID here", type=str)
     os.environ["CLARIFAI_USER_ID"] = user_id
     ctx.obj['user_id'] = user_id
-    click.echo("User ID saved successfully.")
+    logger.info("User ID saved successfully.")
 
   if env:
     ctx.obj['env'] = env
@@ -101,8 +102,18 @@ def login(ctx, config, env, user_id):
     os.environ["CLARIFAI_API_BASE"] = ctx.obj['base_url']
   elif 'CLARIFAI_API_BASE' in os.environ:
     ctx.obj['base_url'] = os.environ["CLARIFAI_API_BASE"]
+  else:
+    ctx.obj['env'] = 'prod'
+    ctx.obj['base_url'] = set_base_url(ctx.obj['env'])
+    os.environ["CLARIFAI_API_BASE"] = ctx.obj['base_url']
+    logger.info("Base URL saved successfully.")
+
+  config_path = f"{os.getenv('HOME')}/.clarifai/config.yaml"
+  config_dir = os.path.dirname(config_path)
+  if not os.path.exists(config_dir):
+    os.makedirs(config_dir)
 
-  dump_yaml(ctx.obj, 'config.yaml')
+  dump_yaml(ctx.obj, config_path)
 
 
 # Import the CLI commands to register them

{clarifai-11.1.7rc3 → clarifai-11.2.1}/clarifai/cli/compute_cluster.py

@@ -1,7 +1,8 @@
 import click
+
 from clarifai.cli.base import cli
 from clarifai.client.user import User
-from clarifai.utils.cli import display_co_resources
+from clarifai.utils.cli import display_co_resources, validate_context
 
 
 @cli.group(['computecluster', 'cc'])
@@ -24,6 +25,8 @@ def computecluster():
 @click.pass_context
 def create(ctx, config, compute_cluster_id):
   """Create a new Compute Cluster with the given config file."""
+
+  validate_context(ctx)
   user = User(user_id=ctx.obj['user_id'], pat=ctx.obj['pat'], base_url=ctx.obj['base_url'])
   if compute_cluster_id:
     user.create_compute_cluster(config, compute_cluster_id=compute_cluster_id)
@@ -37,6 +40,8 @@ def create(ctx, config, compute_cluster_id):
 @click.pass_context
 def list(ctx, page_no, per_page):
   """List all compute clusters for the user."""
+
+  validate_context(ctx)
   user = User(user_id=ctx.obj['user_id'], pat=ctx.obj['pat'], base_url=ctx.obj['base_url'])
   response = user.list_compute_clusters(page_no, per_page)
   display_co_resources(response, "Compute Cluster")
@@ -47,5 +52,7 @@ def list(ctx, page_no, per_page):
 @click.pass_context
 def delete(ctx, compute_cluster_id):
   """Deletes a compute cluster for the user."""
+
+  validate_context(ctx)
   user = User(user_id=ctx.obj['user_id'], pat=ctx.obj['pat'], base_url=ctx.obj['base_url'])
   user.delete_compute_clusters([compute_cluster_id])

{clarifai-11.1.7rc3 → clarifai-11.2.1}/clarifai/cli/deployment.py

@@ -1,7 +1,7 @@
 import click
 from clarifai.cli.base import cli
 from clarifai.client.nodepool import Nodepool
-from clarifai.utils.cli import display_co_resources, from_yaml
+from clarifai.utils.cli import display_co_resources, from_yaml, validate_context
 
 
 @cli.group(['deployment', 'dpl'])
@@ -29,6 +29,8 @@ def deployment():
 @click.pass_context
 def create(ctx, nodepool_id, config, deployment_id):
   """Create a new Deployment with the given config file."""
+
+  validate_context(ctx)
   if not nodepool_id:
     deployment_config = from_yaml(config)
     nodepool_id = deployment_config['deployment']['nodepools'][0]['id']
@@ -56,6 +58,7 @@ def create(ctx, nodepool_id, config, deployment_id):
 def list(ctx, nodepool_id, page_no, per_page):
   """List all deployments for the nodepool."""
 
+  validate_context(ctx)
   nodepool = Nodepool(
       nodepool_id=nodepool_id,
       user_id=ctx.obj['user_id'],
@@ -76,6 +79,7 @@ def list(ctx, nodepool_id, page_no, per_page):
 def delete(ctx, nodepool_id, deployment_id):
   """Deletes a deployment for the nodepool."""
 
+  validate_context(ctx)
   nodepool = Nodepool(
       nodepool_id=nodepool_id,
       user_id=ctx.obj['user_id'],

{clarifai-11.1.7rc3 → clarifai-11.2.1}/clarifai/cli/model.py

@@ -76,31 +76,6 @@ def download_checkpoints(model_path, out_path, stage):
     required=False,
     default=".",
 )
-@click.option(
-    '--out_path',
-    type=click.Path(exists=False),
-    required=False,
-    default=None,
-    help='Path to write the method signature defitions to. If not provided, use stdout.')
-def signatures(model_path, out_path):
-  """Generate method signatures for the model."""
-
-  from clarifai.runners.models.model_builder import ModelBuilder
-  builder = ModelBuilder(model_path, download_validation_only=True)
-  signatures = builder.method_signatures_yaml()
-  if out_path:
-    with open(out_path, 'w') as f:
-      f.write(signatures)
-  else:
-    click.echo(signatures)
-
-
-@model.command()
-@click.option(
-    '--model_path',
-    type=click.Path(exists=True),
-    required=True,
-    help='Path to the model directory.')
 @click.option(
     '--mode',
     type=click.Choice(['env', 'container'], case_sensitive=False),
@@ -121,11 +96,14 @@ def signatures(model_path, out_path):
     help=
     'Keep the Docker image after testing the model locally (applicable for container mode). Defaults to False.'
 )
-def test_locally(model_path, keep_env=False, keep_image=False, mode='env'):
-  """Test model locally.
-
-  MODEL_PATH: Path to the model directory. If not specified, the current directory is used by default.
-  """
+@click.option(
+    '--skip_dockerfile',
+    is_flag=True,
+    help=
+    'Flag to skip generating a dockerfile so that you can manually edit an already created dockerfile. Apply for `--mode conatainer`.',
+)
+def test_locally(model_path, keep_env=False, keep_image=False, mode='env', skip_dockerfile=False):
+  """Test model locally."""
   try:
     from clarifai.runners.models import model_run_locally
     if mode == 'env' and keep_image:
@@ -139,7 +117,11 @@ def test_locally(model_path, keep_env=False, keep_image=False, mode='env'):
     elif mode == "container":
       click.echo("Testing model locally inside a container...")
       model_run_locally.main(
-          model_path, inside_container=True, run_model_server=False, keep_image=keep_image)
+          model_path,
+          inside_container=True,
+          run_model_server=False,
+          keep_image=keep_image,
+          skip_dockerfile=skip_dockerfile)
     click.echo("Model tested successfully.")
   except Exception as e:
     click.echo(f"Failed to test model locally: {e}", err=True)
@@ -179,11 +161,14 @@ def test_locally(model_path, keep_env=False, keep_image=False, mode='env'):
     help=
     'Keep the Docker image after testing the model locally (applicable for container mode). Defaults to False.'
 )
-def run_locally(model_path, port, mode, keep_env, keep_image):
-  """Run the model locally and start a gRPC server to serve the model.
-
-  MODEL_PATH: Path to the model directory. If not specified, the current directory is used by default.
-  """
+@click.option(
+    '--skip_dockerfile',
+    is_flag=True,
+    help=
+    'Flag to skip generating a dockerfile so that you can manually edit an already created dockerfile. Apply for `--mode conatainer`.',
+)
+def run_locally(model_path, port, mode, keep_env, keep_image, skip_dockerfile=False):
+  """Run the model locally and start a gRPC server to serve the model."""
   try:
     from clarifai.runners.models import model_run_locally
     if mode == 'env' and keep_image:
@@ -201,7 +186,8 @@ def run_locally(model_path, port, mode, keep_env, keep_image):
           inside_container=True,
           run_model_server=True,
           port=port,
-          keep_image=keep_image)
+          keep_image=keep_image,
+          skip_dockerfile=skip_dockerfile)
     click.echo(f"Model server started locally from {model_path} in {mode} mode.")
   except Exception as e:
     click.echo(f"Failed to starts model server locally: {e}", err=True)
@@ -255,7 +241,8 @@ def predict(ctx, config, model_id, user_id, app_id, model_url, file_path, url, b
   import json
 
   from clarifai.client.model import Model
-  from clarifai.utils.cli import from_yaml
+  from clarifai.utils.cli import from_yaml, validate_context
+  validate_context(ctx)
   if config:
     config = from_yaml(config)
     model_id, user_id, app_id, model_url, file_path, url, bytes, input_type, compute_cluster_id, nodepool_id, deployment_id, inference_params, output_config = (

{clarifai-11.1.7rc3 → clarifai-11.2.1}/clarifai/cli/nodepool.py

@@ -1,7 +1,7 @@
 import click
 from clarifai.cli.base import cli
 from clarifai.client.compute_cluster import ComputeCluster
-from clarifai.utils.cli import display_co_resources, dump_yaml, from_yaml
+from clarifai.utils.cli import display_co_resources, dump_yaml, from_yaml, validate_context
 
 
 @cli.group(['nodepool', 'np'])
@@ -27,6 +27,7 @@ def nodepool():
 def create(ctx, compute_cluster_id, config, nodepool_id):
   """Create a new Nodepool with the given config file."""
 
+  validate_context(ctx)
   nodepool_config = from_yaml(config)
   if not compute_cluster_id:
     if 'compute_cluster' not in nodepool_config['nodepool']:
@@ -63,6 +64,7 @@ def create(ctx, compute_cluster_id, config, nodepool_id):
 def list(ctx, compute_cluster_id, page_no, per_page):
   """List all nodepools for the user."""
 
+  validate_context(ctx)
   compute_cluster = ComputeCluster(
       compute_cluster_id=compute_cluster_id,
       user_id=ctx.obj['user_id'],
@@ -83,6 +85,7 @@ def list(ctx, compute_cluster_id, page_no, per_page):
 def delete(ctx, compute_cluster_id, nodepool_id):
   """Deletes a nodepool for the user."""
 
+  validate_context(ctx)
   compute_cluster = ComputeCluster(
       compute_cluster_id=compute_cluster_id,
       user_id=ctx.obj['user_id'],