clarifai 11.2.0__py3-none-any.whl → 11.2.1__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.2.0"
+__version__ = "11.2.1"

clarifai/cli/base.py

@@ -43,17 +43,10 @@ def cli(ctx):
   """Clarifai CLI"""
   ctx.ensure_object(dict)
   config_path = f"{os.getenv('HOME')}/.clarifai/config.yaml"
-  config_dir = os.path.dirname(config_path)
   if os.path.exists(config_path):
     ctx.obj = from_yaml(config_path)
   else:
     ctx.obj = {}
-    if ctx.invoked_subcommand != 'login':
-      logger.error("Error getting config: CLI config file missing")
-      logger.info("Running `login` to set up the CLI configuration.")
-      if not os.path.exists(config_dir):
-        os.makedirs(config_dir)
-      ctx.invoke(login)
 
 
 @cli.command()
@@ -74,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
@@ -97,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
@@ -113,9 +106,14 @@ def login(ctx, config, env, user_id):
     ctx.obj['env'] = 'prod'
     ctx.obj['base_url'] = set_base_url(ctx.obj['env'])
     os.environ["CLARIFAI_API_BASE"] = ctx.obj['base_url']
-    click.echo("Base URL saved successfully.")
+    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, f"{os.getenv('HOME')}/.clarifai/config.yaml")
+  dump_yaml(ctx.obj, config_path)
 
 
 # Import the CLI commands to register them

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/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/cli/model.py

@@ -96,11 +96,14 @@ def download_checkpoints(model_path, out_path, stage):
     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:
@@ -114,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)
@@ -154,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:
@@ -176,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)
@@ -230,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/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'],

clarifai/runners/models/model_run_locally.py

@@ -473,7 +473,8 @@ def main(model_path,
          inside_container=False,
          port=8080,
          keep_env=False,
-         keep_image=False):
+         keep_image=False,
+         skip_dockerfile: bool = False):
 
   manager = ModelRunLocally(model_path)
   # get whatever stage is in config.yaml to force download now
@@ -484,10 +485,13 @@ def main(model_path,
   if inside_container:
     if not manager.is_docker_installed():
       sys.exit(1)
-    manager.builder.create_dockerfile()
+    if not skip_dockerfile:
+      manager.builder.create_dockerfile()
     image_tag = manager._docker_hash()
-    image_name = f"{manager.config['model']['id']}:{image_tag}"
-    container_name = manager.config['model']['id']
+    model_id = manager.config['model']['id'].lower()
+    # must be in lowercase
+    image_name = f"{model_id}:{image_tag}"
+    container_name = model_id
     if not manager.docker_image_exists(image_name):
       manager.build_docker_image(image_name=image_name)
     try:

clarifai/utils/cli.py

@@ -1,6 +1,7 @@
 import importlib
 import os
 import pkgutil
+import sys
 
 import click
 import yaml
@@ -10,6 +11,8 @@ from rich.panel import Panel
 from rich.style import Style
 from rich.text import Text
 
+from clarifai.utils.logging import logger
+
 
 def from_yaml(filename: str):
   try:
@@ -68,3 +71,9 @@ def display_co_resources(response, resource_type):
         border_style="green",
         width=60)
     console.print(panel)
+
+
+def validate_context(ctx):
+  if ctx.obj == {}:
+    logger.error("CLI config file missing. Run `clarifai login` to set up the CLI config.")
+    sys.exit(1)

{clarifai-11.2.0.dist-info → clarifai-11.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.2.0
+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.5
+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

{clarifai-11.2.0.dist-info → clarifai-11.2.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-clarifai/__init__.py,sha256=VIaU72qq7Ra35KV6zKPuIujD7yQXELMsD6Ypm1ZDIMU,23
+clarifai/__init__.py,sha256=R3NVFNSpKk1o0N9GhBBuvfPhVFPrY5oLJJk5xhzNpGY,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
 clarifai/cli/README.md,sha256=YGApHfeUyu5P0Pdth-mqQCQftWHDxz6bugDlvDXDhOE,1942
 clarifai/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/cli/__main__.py,sha256=utJ2F40cl0jPHcYdTlGZRqpPfZ0CtVYB-8Ft0b2fWD4,72
-clarifai/cli/base.py,sha256=OL8VAaxnCXLf1IMsn4_Ewx0CVEjWGh2qr9Yt-3bvo74,4031
-clarifai/cli/compute_cluster.py,sha256=N2dNQNJEPg9nxsb8x2igEzYuGRzjn7l4kNttjFIxmhI,1827
-clarifai/cli/deployment.py,sha256=sUEuz5-rtozMx8deVcJXLi6lHsP2jc8x3y2MpUAVfqY,2506
-clarifai/cli/model.py,sha256=9tSR_IiyZcSdTwrXOfv36MqaQ_61wLltpwsggh3yE4w,11677
-clarifai/cli/nodepool.py,sha256=yihxS_rIFoBBKzRlqBX8Ab42iPpBMJrJFsk8saph6ms,3049
+clarifai/cli/base.py,sha256=SOAic4T6Hg7VJJ-UDdjTuTNI1Hu_YANmzW_giUjK24o,3853
+clarifai/cli/compute_cluster.py,sha256=v77YUbZjmXbTq0wCmcUJ8TzYSfFEtB1na87-iZuG21Q,1921
+clarifai/cli/deployment.py,sha256=Vv92Qo7Q3UmMiCdrGQ4qNVNVzfcDyl-GB6B7kx8gyFw,2597
+clarifai/cli/model.py,sha256=PR-A7V3D78iAjNx2hNeputiWuIyINrx2SJmjKtfMoQ4,12079
+clarifai/cli/nodepool.py,sha256=eYo3l9NMSwjeFzsuwKSYVkR1FdZ7_NcCdNvzGsBBMzY,3139
 clarifai/client/__init__.py,sha256=xI1U0l5AZdRThvQAXCLsd9axxyFzXXJ22m8LHqVjQRU,662
 clarifai/client/app.py,sha256=6pckYme1urV2YJjLIYfeZ-vH0Z5YSQa51jzIMcEfwug,38342
 clarifai/client/base.py,sha256=hSHOqkXbSKyaRDeylMMnkhUHCAHhEqno4KI0CXGziBA,7536
@@ -68,7 +68,7 @@ clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 clarifai/runners/models/base_typed_model.py,sha256=0QCWxch8CcyJSKvE1D4PILd2RSnQZHTmx4DXlQQ6dpo,7856
 clarifai/runners/models/model_builder.py,sha256=YCnZsAIE0CB-M0c2cvdEzY4O11I80STshd36dqDAN2Q,32565
 clarifai/runners/models/model_class.py,sha256=9JSPAr4U4K7xI0kSl-q0mHB06zknm2OR-8XIgBCto94,1611
-clarifai/runners/models/model_run_locally.py,sha256=BNzn4h6ma6qA_7yeaPheJRoylssHx9ow5NeFRBWXuYg,20442
+clarifai/runners/models/model_run_locally.py,sha256=hSkXrln4q1_EEtRyGH5g0nMg-ieGWmamD7cI5YV_qIk,20550
 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
@@ -80,7 +80,7 @@ clarifai/runners/utils/url_fetcher.py,sha256=v_8JOWmkyFAzsBulsieKX7Nfjy1Yg7wGSZe
 clarifai/schema/search.py,sha256=JjTi8ammJgZZ2OGl4K6tIA4zEJ1Fr2ASZARXavI1j5c,2448
 clarifai/urls/helper.py,sha256=tjoMGGHuWX68DUB0pk4MEjrmFsClUAQj2jmVEM_Sy78,4751
 clarifai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/utils/cli.py,sha256=CdcLsF00KdfA-BgMIbO-u88gUF9Ts1n0TDDZS-oImp8,1949
+clarifai/utils/cli.py,sha256=P29JalmKQLQBWqbW2_bumCLNSUUo8APtLXD8zS0dcIk,2160
 clarifai/utils/constants.py,sha256=MG_iHnSwNEyUZOpvsrTicNwaT4CIjmlK_Ixk_qqEX8g,142
 clarifai/utils/logging.py,sha256=CVy8OsLrlbg-b8qe88kb1yO_9wi9wRYfF-QkIaN9xE8,11936
 clarifai/utils/misc.py,sha256=4aNOHPTNdX-WGxuNab8qKePoCMUnscd-aN_dQEIVSWk,2933
@@ -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.2.0.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.2.0.dist-info/METADATA,sha256=RqwiHt12kWum-svcHdU-cy18o_ie4zH8JYKNtysR0FY,22472
-clarifai-11.2.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-clarifai-11.2.0.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.2.0.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.2.0.dist-info/RECORD,,
+clarifai-11.2.1.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.2.1.dist-info/METADATA,sha256=te276wArqCAEYdsF-LYLQSTxMZiPtAVO_a2lEQngFNU,22472
+clarifai-11.2.1.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+clarifai-11.2.1.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.2.1.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.2.1.dist-info/RECORD,,

{clarifai-11.2.0.dist-info → clarifai-11.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.0.2)
 Root-Is-Purelib: true
 Tag: py3-none-any