clarifai 11.2.2__py3-none-any.whl → 11.2.3__py3-none-any.whl

clarifai/utils/logging.py

@@ -10,15 +10,6 @@ import traceback
 from collections import defaultdict
 from typing import Any, Dict, List, Optional, Union
 
-from rich import print as rprint
-from rich.console import Console
-from rich.logging import RichHandler
-from rich.table import Table
-from rich.traceback import install
-from rich.tree import Tree
-
-install()
-
 # The default logger to use throughout the SDK is defined at bottom of this file.
 
 # For the json logger.
@@ -29,6 +20,20 @@ FIELD_BLACKLIST = [
     'msg', 'message', 'account', 'levelno', 'created', 'threadName', 'name', 'processName',
     'module', 'funcName', 'msecs', 'relativeCreated', 'pathname', 'args', 'thread', 'process'
 ]
+COLORS = {
+    'ARGUMENTS': '\033[90m',  # Gray
+    'DEBUG': '\033[90m',  # Gray
+    'INFO': '\033[32m',  # Green
+    'WARNING': '\033[33m',  # Yellow
+    'ERROR': '\033[31m',  # Red
+    'CRITICAL': '\033[31m',  # Red
+    'TIME': '\033[34m',
+    'RESET': '\033[0m'
+}
+LOG_FORMAT = f"[%(levelname)s] {COLORS.get('TIME')}%(asctime)s{COLORS.get('RESET')} %(message)s |" \
+             f"{COLORS.get('ARGUMENTS')} " \
+             f"%(optional_args)s " \
+             f"thread=%(thread)d {COLORS.get('RESET')}"
 
 # Create thread local storage that the format() call below uses.
 # This is only used by the json_logger in the appropriate CLARIFAI_DEPLOY levels.
@@ -59,6 +64,9 @@ def get_req_id_from_context():
 
 def display_workflow_tree(nodes_data: List[Dict]) -> None:
   """Displays a tree of the workflow nodes."""
+  from rich import print as rprint
+  from rich.tree import Tree
+
   # Create a mapping of node_id to the list of node_ids that are connected to it.
   node_adj_mapping = defaultdict(list)
   # Create a mapping of node_id to the node data info.
@@ -104,8 +112,10 @@ def display_workflow_tree(nodes_data: List[Dict]) -> None:
   rprint(tree)
 
 
-def table_from_dict(data: List[Dict], column_names: List[str], title: str = "") -> Table:
+def table_from_dict(data: List[Dict], column_names: List[str],
+                    title: str = "") -> 'rich.Table':  #noqa F821
   """Use this function for printing tables from a list of dicts."""
+  from rich.table import Table
   table = Table(title=title, show_lines=False, show_header=True, header_style="blue")
   for column_name in column_names:
     table.add_column(column_name)
@@ -134,23 +144,18 @@ def _configure_logger(name: str, logger_level: Union[int, str] = logging.NOTSET)
   # If ENABLE_JSON_LOGGER is not set, then use json logger if in k8s.
   enabled_json = os.getenv('ENABLE_JSON_LOGGER', None)
   in_k8s = 'KUBERNETES_SERVICE_HOST' in os.environ
+  handler = logging.StreamHandler()
+  handler.setLevel(logger_level)
   if enabled_json == 'true' or (in_k8s and enabled_json != 'false'):
     # Add the json handler and formatter
-    handler = logging.StreamHandler()
     formatter = JsonFormatter()
     handler.setFormatter(formatter)
-    logger.addHandler(handler)
   else:
-    # Add the new rich handler and formatter
-    try:
-      width, _ = os.get_terminal_size()
-    except OSError:
-      width = 255
-    handler = RichHandler(
-        rich_tracebacks=True, log_time_format="%Y-%m-%d %H:%M:%S.%f", console=Console(width=width))
-    formatter = logging.Formatter('%(message)s')
+    # create formatter and add it to the handlers
+    formatter = TerminalFormatter(LOG_FORMAT)
     handler.setFormatter(formatter)
-    logger.addHandler(handler)
+  # add the handlers to the logger
+  logger.addHandler(handler)
 
 
 def get_logger(logger_level: Union[int, str] = logging.NOTSET,
@@ -207,6 +212,8 @@ def display_concept_relations_tree(relations_dict: Dict[str, Any]) -> None:
     Args:
         relations_dict (dict): A dict of concept relations info.
     """
+  from rich import print as rprint
+  from rich.tree import Tree
   for parent, children in relations_dict.items():
     tree = Tree(parent)
     for child in children:
@@ -372,5 +379,41 @@ class JsonFormatter(logging.Formatter):
       )
 
 
+class TerminalFormatter(logging.Formatter):
+  """ If you have fields in your Formatter (see setup_logger where we setup the format strings) then
+  you can set them on the record using a filter. We do that for req_id here which is a request
+  specific field. This allows us to find requests easily between services.
+  """
+
+  def format(self, record):
+    record.optional_args = []
+
+    user_id = getattr(thread_log_info, 'user_id', None)
+    if user_id is not None:
+      record.optional_args.append("user_id=" + user_id)
+
+    app_id = getattr(thread_log_info, 'app_id', None)
+    if app_id is not None:
+      record.optional_args.append("app_id=" + app_id)
+
+    req_id = getattr(thread_log_info, 'req_id', None)
+    if req_id is not None:
+      record.optional_args.append("req_id=" + req_id)
+
+    record.optional_args = " ".join(record.optional_args)
+
+    color_code = COLORS.get(record.levelname, '')
+
+    record.levelname = f"{color_code}{record.levelname}{COLORS.get('RESET')}"
+    record.msg = f"{color_code}{str(record.msg)}{COLORS.get('RESET')}"
+
+    return super(TerminalFormatter, self).format(record)
+
+  def formatTime(self, record, datefmt=None):
+    # Note we didn't go with UTC here as it's easier to understand time in your time zone.
+    # The json logger leverages UTC though.
+    return datetime.datetime.fromtimestamp(record.created).strftime('%H:%M:%S.%f')
+
+
 # the default logger for the SDK.
 logger = get_logger(logger_level=os.environ.get("LOG_LEVEL", "INFO"), name="clarifai")

clarifai/utils/misc.py

@@ -12,6 +12,8 @@ RETRYABLE_CODES = [
     status_code_pb2.MODEL_BUSY_PLEASE_RETRY
 ]
 
+DEFAULT_CONFIG = f'{os.environ["HOME"]}/.config/clarifai/config'
+
 
 def status_is_retryable(status_code: int) -> bool:
   """Check if a status code is retryable."""

{clarifai-11.2.2.dist-info → clarifai-11.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.2.2
+Version: 11.2.3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -21,7 +21,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: clarifai-grpc>=11.2.6
-Requires-Dist: clarifai-protocol>=0.0.20
+Requires-Dist: clarifai-protocol>=0.0.21
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: rich>=13.4.2

{clarifai-11.2.2.dist-info → clarifai-11.2.3.dist-info}/RECORD

@@ -1,20 +1,20 @@
-clarifai/__init__.py,sha256=_cDM_DxpY5KiS6333RgrXKdnvdwjkQID_vppBsYvGPM,23
+clarifai/__init__.py,sha256=cMulojaj2PqKzdUooqsKg8CUvyqheI7pr_8Y-DBZwsQ,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=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/cli/base.py,sha256=ZG1Ial89wGVqt4bSFYmIoRH_OZtw2yxlq3Ihp9e025U,7592
+clarifai/cli/compute_cluster.py,sha256=dma_dgzSg5pYQcxlWhoKYdMFPO2KS7HzsN81ploNB-E,2083
+clarifai/cli/deployment.py,sha256=wBWkYfLr6W73LScF6NlQM-reXWUP38VfAudltjpnFpk,3822
+clarifai/cli/model.py,sha256=4n9CmpKOHXY1KxEzhmUy6l5hhU5u_mKhatLXY0L3LVo,12064
+clarifai/cli/nodepool.py,sha256=7nTNd9T-UEPFE36vbxwdUHu2B3NECbN-lSTb_DQYw18,3874
 clarifai/client/__init__.py,sha256=xI1U0l5AZdRThvQAXCLsd9axxyFzXXJ22m8LHqVjQRU,662
 clarifai/client/app.py,sha256=FnKvKksYZwdry0e4Obh-trdSO1mv6QcVAa3kzKiQMpU,38340
 clarifai/client/base.py,sha256=hSHOqkXbSKyaRDeylMMnkhUHCAHhEqno4KI0CXGziBA,7536
 clarifai/client/compute_cluster.py,sha256=EvW9TJjPvInUlggfg1A98sxoWH8_PY5rCVXZhsj6ac0,8705
-clarifai/client/dataset.py,sha256=y3zKT_VhP1gyN3OO-b3cPeW21ZXyKbQ7ZJkEG06bsTU,32096
+clarifai/client/dataset.py,sha256=6DqfXQtiHoOJq0vPw2fz5ATo5zxQMmlhKG9IBwhnXeU,32078
 clarifai/client/deployment.py,sha256=w7Y6pA1rYG4KRK1SwusRZc2sQRXlG8wezuVdzSWpCo0,2586
 clarifai/client/input.py,sha256=obMAHMDU1OwfXZ8KraOnGFlWzlW-3F7Ob_2lcOQMlhY,46339
 clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
@@ -27,7 +27,7 @@ clarifai/client/workflow.py,sha256=5VjZ2D8cudLznR8yhrwNawOmjxUhkJllZMKM6pn-4gs,1
 clarifai/client/auth/__init__.py,sha256=7EwR0NrozkAUwpUnCsqXvE_p0wqx_SelXlSpKShKJK0,136
 clarifai/client/auth/helper.py,sha256=Ngw5IDkOWvnOz5YwViVk55z3mC52MyezLc0G3WxLqok,14643
 clarifai/client/auth/register.py,sha256=2CMdBsoVLoTfjyksE6j7BM2tiEc73WKYvxnwDDgNn1k,536
-clarifai/client/auth/stub.py,sha256=xy4-fV0W8keCgXld4eOVzFQEIKxOktNwtL5bLztReug,4940
+clarifai/client/auth/stub.py,sha256=FrA5QpEFY4sK6fvPVhTg19ROLHkYSRo343nNqiVE7xw,4963
 clarifai/constants/base.py,sha256=ogmFSZYoF0YhGjHg5aiOc3MLqPr_poKAls6xaD0_C3U,89
 clarifai/constants/dataset.py,sha256=vjK3IlgXu31HycuvjRSzEQSqhU6xfj5TIgo6IpyUWoc,609
 clarifai/constants/input.py,sha256=WcHwToUVIK9ItAhDefaSohQHCLNeR55PSjZ0BFnoZ3U,28
@@ -66,13 +66,13 @@ clarifai/runners/server.py,sha256=xHDLdhQApCgYG19QOKXqJNCGNyw1Vsvobq3UdryDrVc,41
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=5cjv7U8PmWa3DB_5B1CqSYh_6GE0E0np52TIAa7EIDE,2312
 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=NAZiOm2ok-ThQ-jcAyBTRRCFufmyxGY76vlkLMpYHq4,33320
+clarifai/runners/models/model_builder.py,sha256=eL7gLgdJjsHrJy2Omu0XiGoACBl3CwCZan4SSEiUmG8,33984
 clarifai/runners/models/model_class.py,sha256=9JSPAr4U4K7xI0kSl-q0mHB06zknm2OR-8XIgBCto94,1611
-clarifai/runners/models/model_run_locally.py,sha256=jz4ZvRj0eMCEziV3X37wH2AEe3Gl9Icx7Quy1ymaDe0,20556
+clarifai/runners/models/model_run_locally.py,sha256=qwWJ4UvvMx3ktbwIwjoucJ725TxRbK9CDa5ZMiy6vJM,20592
 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
-clarifai/runners/utils/const.py,sha256=bwj-Pcw558-pasdIFbNhnkn-9oiCdojYH1fNTTUG2gU,1048
+clarifai/runners/utils/const.py,sha256=9qnOC1Bt6SGLQ9XCQEQ6519XhW4gzcztsV1Rgej67Vw,1055
 clarifai/runners/utils/data_handler.py,sha256=sxy9zlAgI6ETuxCQhUgEXAn2GCsaW1GxpK6GTaMne0g,6966
 clarifai/runners/utils/data_utils.py,sha256=R1iQ82TuQ9JwxCJk8yEB1Lyb0BYVhVbWJI9YDi1zGOs,318
 clarifai/runners/utils/loader.py,sha256=Sl0m29RDtMPx2cIiSbbDFtKHQj2ktXQ5CnkvaHi-zDc,8804
@@ -80,10 +80,11 @@ 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=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
+clarifai/utils/cli.py,sha256=FUFJJb8Jzohpt132JE43xHNzWtX0N8fbWROxJISfCM0,5072
+clarifai/utils/config.py,sha256=MxuQ1U4EOT4yVOEcRyv3OUPnoY_A_J5cZKHJGiuuo30,2883
+clarifai/utils/constants.py,sha256=fdCmw8fjgo8eoWu85t95ZoRTrgXC5_XVXFyB8_VQTtw,219
+clarifai/utils/logging.py,sha256=I2Sj1X-phYcINXe4-pW22Tq6Sz5PlwcxYQh7zORBbeM,13634
+clarifai/utils/misc.py,sha256=gensDjU5pV44iFzUzmM_Lf6PZX63GFxRXJX91esEjAg,2999
 clarifai/utils/model_train.py,sha256=Mndqy5GNu7kjQHjDyNVyamL0hQFLGSHcWhOuPyOvr1w,8005
 clarifai/utils/evaluation/__init__.py,sha256=PYkurUrXrGevByj7RFb6CoU1iC7fllyQSfnnlo9WnY8,69
 clarifai/utils/evaluation/helpers.py,sha256=aZeHLI7oSmU5YDWQp5GdkYW5qbHx37nV9xwunKTAwWM,18549
@@ -93,9 +94,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.2.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.2.2.dist-info/METADATA,sha256=mWqPwNuC1LdGkPWUu5ugnqADyHzcwR18PA66roRCPj4,22472
-clarifai-11.2.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-clarifai-11.2.2.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.2.2.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.2.2.dist-info/RECORD,,
+clarifai-11.2.3.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.2.3.dist-info/METADATA,sha256=7YnU6nLN-FgtfIPvDfv-qMUvS8B93f86eYrZFC4S-V0,22472
+clarifai-11.2.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+clarifai-11.2.3.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.2.3.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.2.3.dist-info/RECORD,,