anatools 6.0.0__tar.gz → 6.0.2__tar.gz

{anatools-6.0.0/anatools.egg-info → anatools-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anatools
-Version: 6.0.0
+Version: 6.0.2
 Summary: Tools for development with the Rendered.ai Platform.
 Home-page: https://rendered.ai
 Author: Rendered AI, Inc
@@ -14,7 +14,7 @@ Requires-Dist: docker
 Requires-Dist: numpy
 Requires-Dist: pillow
 Requires-Dist: pyyaml
-Requires-Dist: requests
+Requires-Dist: requests<3.0.0,>=2.32.3
 Requires-Dist: colorama
 Dynamic: author
 Dynamic: author-email

{anatools-6.0.0 → anatools-6.0.2}/anatools/__init__.py

@@ -16,4 +16,4 @@ View the `Introduction to Rendered.ai Documentation`_ to learn more.
 from .anaclient.anaclient import client
 from .annotations.annotations import annotations
 
-__version__ = '6.0.0'
+__version__ = '6.0.2'

{anatools-6.0.0 → anatools-6.0.2}/anatools/anaclient/api/api.py

@@ -117,8 +117,12 @@ class api:
         responsedata = response.json()
         if self.verbose == 'debug': print(responsedata)
         try:
+            # Check for errors FIRST, even if data exists (partial response scenario in GraphQL)
+            # This ensures errors like "The Datasets limit has been reached by this workspace"
+            # are properly raised instead of being silently ignored when data is also present
+            if 'errors' in responsedata and responsedata['errors']:
+                raise Exception(responsedata['errors'][-1]['message'])
             if 'data' in responsedata and responsedata['data'] is not None and call in responsedata['data']: return responsedata['data'][call]
-            elif 'errors' in responsedata: raise Exception(responsedata['errors'][-1]['message'])
             else: raise Exception()
         except Exception as e:
             raise Exception(f'There was an issue with the {call} API call: {e}')

{anatools-6.0.0 → anatools-6.0.2}/anatools/anaclient/api/datasets.py

@@ -118,21 +118,39 @@ def editDataset(self, workspaceId, datasetId, name=None, description=None, pause
 
 def downloadDataset(self, workspaceId, datasetId):
     response = self.session.post(
-        url = self.url, 
-        headers = self.headers, 
+        url = self.url,
+        headers = self.headers,
         json = {
             "operationName": "downloadDataset",
             "variables": {
                 "workspaceId": workspaceId,
                 "datasetId": datasetId
             },
-            "query": """mutation 
+            "query": """mutation
                 downloadDataset($workspaceId: String!, $datasetId: String!) {
                     downloadDataset(workspaceId: $workspaceId, datasetId: $datasetId)
                 }"""})
     return self.errorhandler(response, "downloadDataset")
 
 
+def downloadDatasetFile(self, workspaceId, datasetId, filepath):
+    response = self.session.post(
+        url = self.url,
+        headers = self.headers,
+        json = {
+            "operationName": "downloadDatasetFile",
+            "variables": {
+                "workspaceId": workspaceId,
+                "datasetId": datasetId,
+                "filepath": filepath
+            },
+            "query": """mutation
+                downloadDatasetFile($workspaceId: String!, $datasetId: String!, $filepath: String!) {
+                    downloadDatasetFile(workspaceId: $workspaceId, datasetId: $datasetId, filepath: $filepath)
+                }"""})
+    return self.errorhandler(response, "downloadDatasetFile")
+
+
 def cancelDataset(self, workspaceId, datasetId):
     response = self.session.post(
         url = self.url, 

{anatools-6.0.0 → anatools-6.0.2}/anatools/anaclient/api/preview.py

@@ -25,17 +25,38 @@ def getPreview(self, workspaceId, previewId, fields=None):
 
 def createPreview(self, workspaceId, graphId):
     response = self.session.post(
-        url = self.url, 
-        headers = self.headers, 
+        url = self.url,
+        headers = self.headers,
         json = {
             "operationName": "createPreview",
             "variables": {
                 "workspaceId": workspaceId,
                 "graphId": graphId
             },
-            "query": """mutation 
+            "query": """mutation
                 createPreview($workspaceId: String!, $graphId: String!) {
                     createPreview(workspaceId: $workspaceId, graphId: $graphId)
                 }"""})
     return self.errorhandler(response, "createPreview")
 
+
+def getPreviewLog(self, workspaceId, previewId, fields=None):
+    if fields is None: fields = self.getTypeFields("PreviewLog")
+    fields = "\n".join(fields)
+    response = self.session.post(
+        url = self.url,
+        headers = self.headers,
+        json = {
+            "operationName": "getPreviewLog",
+            "variables": {
+                "workspaceId": workspaceId,
+                "previewId": previewId
+            },
+            "query": f"""query
+                getPreviewLog($workspaceId: String!, $previewId: String!) {{
+                    getPreviewLog(workspaceId: $workspaceId, previewId: $previewId) {{
+                        {fields}
+                    }}
+                }}"""})
+    return self.errorhandler(response, "getPreviewLog")
+

{anatools-6.0.0 → anatools-6.0.2}/anatools/anaclient/datasets.py

@@ -219,7 +219,67 @@ def download_dataset(self, datasetId, workspaceId=None, localDir=None):
             raise Exception(f"Dataset '{dataset_name}' is not available for download (status: {dataset_status}). The dataset may still be processing or may have failed.")
 
     fname = dataset_name + '.zip'
-    return download_file(url=url, fname=fname, localDir=localDir) 
+    return download_file(url=url, fname=fname, localDir=localDir)
+
+
+def download_dataset_file(self, datasetId, filepath, workspaceId=None, localDir=None):
+    """Download a single file from a dataset.
+
+    This allows downloading individual files from a dataset rather than
+    downloading the entire dataset archive. Use get_dataset_files() to
+    list available files in a dataset.
+
+    Parameters
+    ----------
+    datasetId : str
+        Dataset ID of the dataset containing the file.
+    filepath : str
+        Relative path to the file within the dataset (e.g., "images/000000-1-image.png").
+    workspaceId : str
+        Workspace ID that the dataset is in. If none is provided, the default workspace will get used.
+    localDir : str
+        Path for where to download the file. If none is provided, current working directory will be used.
+
+    Returns
+    -------
+    str
+        Returns the path the file was downloaded to.
+
+    Raises
+    ------
+    ValueError
+        If datasetId or filepath is not provided.
+    Exception
+        If the file cannot be downloaded (e.g., not found).
+
+    Examples
+    --------
+    >>> # First, list available files
+    >>> files = ana.get_dataset_files(datasetId='abc123', path='images')
+    >>> print(files)
+    ['000000-1-image.png', '000001-1-image.png', ...]
+    >>>
+    >>> # Then download a specific file
+    >>> path = ana.download_dataset_file(datasetId='abc123', filepath='images/000000-1-image.png')
+    >>> print(path)
+    '/home/user/000000-1-image.png'
+    """
+    import os
+    from anatools.lib.download import download_file
+
+    self.check_logout()
+    if datasetId is None: raise ValueError("The datasetId parameter is required!")
+    if filepath is None or filepath.strip() == '': raise ValueError("The filepath parameter is required!")
+    if workspaceId is None: workspaceId = self.workspace
+
+    url = self.ana_api.downloadDatasetFile(workspaceId=workspaceId, datasetId=datasetId, filepath=filepath)
+
+    if url is None:
+        raise Exception(f"File '{filepath}' not found in dataset '{datasetId}'.")
+
+    # Extract the filename from the filepath
+    fname = os.path.basename(filepath)
+    return download_file(url=url, fname=fname, localDir=localDir)
 
 
 def cancel_dataset(self, datasetId, workspaceId=None):

{anatools-6.0.0 → anatools-6.0.2}/anatools/anaclient/preview.py

@@ -27,14 +27,14 @@ def get_preview(self, previewId, workspaceId=None, fields=None):
 
 def create_preview(self, graphId, workspaceId=None):
     """Creates a preview job.
-    
+
     Parameters
     ----------
     graphId: str
         The unique identifier for the graph.
-    workspaceId : str    
-        Workspace ID create the preview in. If none is provided, the default workspace will get used. 
-    
+    workspaceId : str
+        Workspace ID create the preview in. If none is provided, the default workspace will get used.
+
     Returns
     -------
     str
@@ -43,4 +43,26 @@ def create_preview(self, graphId, workspaceId=None):
     if self.check_logout(): return
     if workspaceId is None: workspaceId = self.workspace
     return self.ana_api.createPreview(workspaceId=workspaceId, graphId=graphId)
+
+
+def get_preview_log(self, previewId, workspaceId=None, fields=None):
+    """Fetches the logs for a preview job.
+
+    Parameters
+    ----------
+    previewId : str
+        The unique identifier for the preview job.
+    workspaceId : str
+        Workspace the preview job was run in. If none is provided, the default workspace will get used.
+    fields : list
+        List of fields to return, leave empty to get all fields.
+
+    Returns
+    -------
+    dict
+        Preview log information containing previewId, status, and logs.
+    """
+    if self.check_logout(): return
+    if workspaceId is None: workspaceId = self.workspace
+    return self.ana_api.getPreviewLog(workspaceId=workspaceId, previewId=previewId, fields=fields)
     

{anatools-6.0.0 → anatools-6.0.2}/anatools/annotations/annotations.py

@@ -14,15 +14,15 @@ class annotations:
     Examples of mapfiles are in the example channel at /ana/channels/example/mapfiles/.
     """
 
-    def bounding_box_2d(self, image_path, out_dir, object_ids=None, object_types=None, line_thickness=1, colors=None):
+    def bounding_box_2d(self, image_path, out_dir, object_ids=None, object_types=None, line_thickness=1, colors=None, quiet=False):
         """
-        Generates images annotated with 2d bounding boxes for datasets downloaded from the Platform. Optional filter on 
+        Generates images annotated with 2d bounding boxes for datasets downloaded from the Platform. Optional filter on
         object_ids or object_types (must choose a single filter).
-        
+
         Parameters
         ----------
         image_path : str
-            Path to of specific image file to draw the boxes for.  
+            Path to of specific image file to draw the boxes for.
         out_dir : str
             File path to directory where the image should be saved to.
         object_ids : list[int]
@@ -30,22 +30,29 @@ class annotations:
         object_types: list[str]
             Filter for the object types to annotate. If not provided, all object types will get annotated. Choose either id or type filter.
         line_thickness: int
-            Desired line thickness for box outline. 
-         colors: dict
+            Desired line thickness for box outline.
+        colors: dict
             Dictionary of colors to use for each object type where each color is a tuple of 3 integers (R, G, B). For example: colors={'Car': (255, 0, 0)}
+        quiet: bool
+            If True, suppress print output. Useful for CLI/automation.
+
+        Returns
+        -------
+        str or None
+            Path to the saved annotated image, or None if an error occurred.
         """
-        draw(image_path, out_dir, draw_type='box_2d', object_ids=object_ids, object_types=object_types, line_thickness=line_thickness, colors=colors)
+        return draw(image_path, out_dir, draw_type='box_2d', object_ids=object_ids, object_types=object_types, line_thickness=line_thickness, colors=colors, quiet=quiet)
 
 
-    def bounding_box_3d(self, image_path, out_dir, object_ids=None, object_types=None, line_thickness=1, colors=None):
+    def bounding_box_3d(self, image_path, out_dir, object_ids=None, object_types=None, line_thickness=1, colors=None, quiet=False):
         """
-        Generates images annotated with 3d bounding boxes for datasets downloaded from the Platform. Optional filter on 
+        Generates images annotated with 3d bounding boxes for datasets downloaded from the Platform. Optional filter on
         object_ids or object_types (must choose a single filter).
-        
+
         Parameters
         ----------
         image_path : str
-            Path to of specific image file to draw the boxes for.  
+            Path to of specific image file to draw the boxes for.
         out_dir : str
             File path to directory where the image should be saved to.
         object_ids : list[int]
@@ -53,22 +60,29 @@ class annotations:
         object_types: list[str]
             Filter for the object types to annotate. If not provided, all object types will get annotated. Choose either id or type filter.
         line_thickness: int
-            Desired line thickness for box outline. 
+            Desired line thickness for box outline.
         colors: dict
             Dictionary of colors to use for each object type where each color is a tuple of 3 integers (R, G, B). For example: colors={'Car': (255, 0, 0)}
+        quiet: bool
+            If True, suppress print output. Useful for CLI/automation.
+
+        Returns
+        -------
+        str or None
+            Path to the saved annotated image, or None if an error occurred.
         """
-        draw(image_path, out_dir, draw_type='box_3d', object_ids=object_ids, object_types=object_types, line_thickness=line_thickness, colors=colors)
+        return draw(image_path, out_dir, draw_type='box_3d', object_ids=object_ids, object_types=object_types, line_thickness=line_thickness, colors=colors, quiet=quiet)
 
 
-    def segmentation(self, image_path, out_dir, object_ids=None, object_types=None, line_thickness=1, colors=None):
+    def segmentation(self, image_path, out_dir, object_ids=None, object_types=None, line_thickness=1, colors=None, quiet=False):
         """
-        Generates images annotated with outlines around objects for datasets downloaded from the Platform. Optional filter on 
+        Generates images annotated with outlines around objects for datasets downloaded from the Platform. Optional filter on
         object_ids or object_types (must choose a single filter).
-        
+
         Parameters
         ----------
         image_path : str
-            Path to of specific image file to draw the boxes for.  
+            Path to of specific image file to draw the boxes for.
         out_dir : str
             File path to directory where the image should be saved to.
         object_ids : list[int]
@@ -79,8 +93,15 @@ class annotations:
             Desired line thickness for object segmentation outline.
         colors: dict
             Dictionary of colors to use for each object type where each color is a tuple of 3 integers (R, G, B). For example: colors={'Car': (255, 0, 0)}
+        quiet: bool
+            If True, suppress print output. Useful for CLI/automation.
+
+        Returns
+        -------
+        str or None
+            Path to the saved annotated image, or None if an error occurred.
         """
-        draw(image_path, out_dir, draw_type='segmentation', object_ids=object_ids, object_types=object_types, line_thickness=line_thickness, colors=colors)
+        return draw(image_path, out_dir, draw_type='segmentation', object_ids=object_ids, object_types=object_types, line_thickness=line_thickness, colors=colors, quiet=quiet)
 
 
     def dump_classification(self, datadir, outdir, mapfile=None):

{anatools-6.0.0 → anatools-6.0.2}/anatools/annotations/draw.py

@@ -4,14 +4,14 @@ import json
 import os
 
 
-def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=None, line_thickness=1, colors=None): 
+def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=None, line_thickness=1, colors=None, quiet=False):
     """
     This function handles the io and draws the right type of annotation on the image.
 
     Parameters
     ----------
     image_path : str
-        Path to of specific image file to draw the boxes for.  
+        Path to of specific image file to draw the boxes for.
     out_dir : str
         File path to directory where the image should be saved to.
     draw_type : str
@@ -24,15 +24,24 @@ def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=
         Desired line thickness for box outline.
     colors: dict
         Dictionary of colors to use for each object type. Must provide a color for each object type specified in the filter.
+    quiet: bool
+        If True, suppress print output. Useful for CLI/automation.
+
+    Returns
+    -------
+    str or None
+        Path to the saved annotated image, or None if an error occurred.
     """
 
     if not os.path.exists(image_path):
-        print('Incorrect path to images: ' + image_path)
-        return
+        if not quiet:
+            print('Incorrect path to images: ' + image_path)
+        return None
 
     if object_types and object_ids:
-        print('Provide either object_types OR object_ids. ')
-        return
+        if not quiet:
+            print('Provide either object_types OR object_ids. ')
+        return None
 
     if not os.path.exists(out_dir):
         os.makedirs(out_dir)
@@ -47,8 +56,8 @@ def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=
     file.close()
     
     annotation_ids = [data['id'] for data in annotations['annotations']]
-    if object_ids is not None and not check_lists(annotation_ids, object_ids, 'object_ids'):
-        return
+    if object_ids is not None and not check_lists(annotation_ids, object_ids, 'object_ids', quiet=quiet):
+        return None
     
     
     metadata_file = root_dir+'/metadata/'+image_name+'-metadata.json'
@@ -62,8 +71,8 @@ def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=
     if object_ids:
         object_data = [data for data in metadata['objects'] if data['id'] in object_ids]
     elif object_types is not None:
-        if not check_lists(metadata_types, object_types, 'object_types'):
-            return  
+        if not check_lists(metadata_types, object_types, 'object_types', quiet=quiet):
+            return None
         object_data = [data for data in metadata['objects'] if data['type'] in object_types]
     else:
         object_data = [data for data in metadata['objects']]
@@ -74,14 +83,15 @@ def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=
             generate_color = [int(val) for val in np.random.randint(0, 255, 3)]
             type_colors[type] = tuple(generate_color)
     else: type_colors = colors
-    
+
 
     draw_img = Image.open(image_path)
     for object in annotations['annotations']:
         if any(object['id'] == d['id'] for d in object_data):
             color_info = [data for data in object_data if object['id'] == data['id']]
             if color_info[0]['type'] not in type_colors:
-                print(f'Color for {color_info[0]["type"]} not found in colors dictionary. Skipping object.')
+                if not quiet:
+                    print(f'Color for {color_info[0]["type"]} not found in colors dictionary. Skipping object.')
                 continue
             if draw_type == 'box_2d':
                 draw_img = box_2d(object['bbox'], draw_img, line_thickness, type_colors[color_info[0]['type']])
@@ -90,11 +100,14 @@ def draw(image_path, out_dir, draw_type='box_2d', object_ids=None, object_types=
             elif draw_type == 'segmentation':
                 draw_img = segmentation(object['segmentation'], draw_img, line_thickness, type_colors[color_info[0]['type']])
             else:
-                print('Provide either box_2d, box_3d, or segmentation')
+                if not quiet:
+                    print('Provide either box_2d, box_3d, or segmentation')
 
     outimg = out_dir+'/'+image_name+'-annotated-'+draw_type+'.'+image_ext
     draw_img.save(outimg)
-    print(f'Image saved to {outimg}')
+    if not quiet:
+        print(f'Image saved to {outimg}')
+    return outimg
 
 
 def box_2d(coordinates, bbox_img, width, outline):
@@ -193,7 +206,7 @@ def segmentation(coordinates, draw_img, width, color):
     return draw_img
 
 
-def check_lists(actual, expected, name_to_check):
+def check_lists(actual, expected, name_to_check, quiet=False):
     """
     Helper function that checks if one list is in another for validation on draw inputs.
 
@@ -205,16 +218,19 @@ def check_lists(actual, expected, name_to_check):
         The expected list that is provided from the user.
     name_to_check: str
         Name of parameter to check (either object_id or object_type).
+    quiet: bool
+        If True, suppress print output.
 
     Returns
     -------
     bool
         True if lists are matching, False otherwise.
     """
-    
+
     if not set(expected).issubset(set(actual)):
         out_of_bounds_check= list(set(expected) - set(actual))
-        print(f'Provided {name_to_check} list has the following out of bounds: {out_of_bounds_check}. Please rerun with valid list. \nHere are all the {name_to_check} that can get annotated: ')
-        print(list(set(actual)))
+        if not quiet:
+            print(f'Provided {name_to_check} list has the following out of bounds: {out_of_bounds_check}. Please rerun with valid list. \nHere are all the {name_to_check} that can get annotated: ')
+            print(list(set(actual)))
         return False
     return True

{anatools-6.0.0 → anatools-6.0.2}/anatools/bin/anadeploy

@@ -347,6 +347,7 @@ try:
             if channels == False or len(channels) == 0: raise Exception(f"Channel {args.channelId} not found")
             remotechannel = channels[0]
         starttime = time.time()
+        client.interactive = True
         deploymentId = client.deploy_channel(channelId=remotechannel['channelId'], channelfile=args.channel)
         print('Registering Channel Image...', flush=True)
         registerstart = time.time()
@@ -512,6 +513,7 @@ try:
                 client.edit_service(serviceId=remoteservice['serviceId'], volumes=volumes)
                 remoteservice = client.get_services(serviceId=remoteservice['serviceId'])[0]
         starttime = time.time()
+        client.interactive = True
         deploymentId = client.deploy_service(serviceId=remoteservice['serviceId'], servicefile=args.service)
         print('Registering Service Image...', flush=True)
         registerstart = time.time()
@@ -521,7 +523,7 @@ try:
             print(f'\033[1F\033[FRegistering Service Image...done.  [{time.time()-registerstart:.3f}s]\033[K\n\033[K')
             print_color(f"The service has been deployed and is ready to use!", color='brand')
             print(f'Deployment Time: {time.time()-starttime:.3f}s\n')
-        client.edit_service(serviceId=remoteservice['serviceId'], schema=json.dumps(localservice.schemas))
+        client.edit_service(serviceId=remoteservice['serviceId'], description=localservice.description, schema=json.dumps(localservice.schemas))
 
         remoteconfig = {
             "serviceId": remoteservice['serviceId'],

{anatools-6.0.0 → anatools-6.0.2}/anatools/bin/anarules

@@ -107,10 +107,12 @@ if args.workspace is not None:
                 try:
                     schema = json.loads(service['schema'])
                     if schema and isinstance(schema, dict):
-                        for tool in schema.keys():
-                            description = "No description"
-                            if isinstance(schema[tool], dict) and 'description' in schema[tool]: description = schema[tool]['description']
-                            rules+=f"\t\t- {tool} : {description}\n"
+                        tools = schema.get('tools', schema.get('execs', schema))
+                        if isinstance(tools, dict):
+                            for tool in tools.keys():
+                                description = "No description"
+                                if isinstance(tools[tool], dict) and 'description' in tools[tool]: description = tools[tool]['description']
+                                rules+=f"\t\t- {tool} : {description}\n"
                 except (json.JSONDecodeError, TypeError) as e:
                     if args.verbose: print(f"Warning: Failed to parse schema for service {service['name']}: {e}")
                     pass