anatools 6.0.1__tar.gz → 6.0.3__tar.gz

{anatools-6.0.1/anatools.egg-info → anatools-6.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anatools
-Version: 6.0.1
+Version: 6.0.3
 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.1 → anatools-6.0.3}/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.1'
+__version__ = '6.0.3'

{anatools-6.0.1 → anatools-6.0.3}/anatools/anaclient/api/graphs.py

@@ -2,8 +2,15 @@
 Graphs API calls.
 """
 
+GRAPH_DEFAULT_FIELDS = [
+    "graphId", "workspaceId", "name", "description",
+    "channel", "channelId", "readOnly", "showPreview", "previewId",
+    "createdBy", "createdAt", "updatedBy", "updatedAt",
+    "hash", "tags",
+]
+
 def getGraphs(self, workspaceId, graphId=None, name=None, email=None, staged=True, limit=100, cursor=None, filters={}, fields=None):
-    if fields is None: fields = self.getTypeFields("Graph")
+    if fields is None: fields = GRAPH_DEFAULT_FIELDS
     fields = "\n".join(fields)
     if filters is None: filters = {}
     response = self.session.post(

{anatools-6.0.1 → anatools-6.0.3}/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.1 → anatools-6.0.3}/anatools/anaclient/api/services.py

@@ -2,16 +2,24 @@
 Services API calls.
 """
 
+SERVICE_DEFAULT_FIELDS = [
+    "serviceId", "name", "sanitizedName", "description", "type",
+    "volumes", "instance", "version", "state", "tags",
+    "organizationId", "organization", "serviceType",
+    "persistentServiceId", "parentServiceId", "url",
+    "createdAt", "updatedAt", "createdBy", "updatedBy",
+]
+
 def getServiceTypes(self, fields=None):
     if fields is None: fields = self.getTypeFields("ServiceType")
     fields = "\n".join(fields)
     response = self.session.post(
-        url = self.url, 
-        headers = self.headers, 
+        url = self.url,
+        headers = self.headers,
         json = {
             "operationName": "getServiceTypes",
             "variables": {},
-            "query": F"""query 
+            "query": F"""query
                 getServiceTypes {{
                     getServiceTypes {{
                         {fields}
@@ -21,7 +29,7 @@ def getServiceTypes(self, fields=None):
 
 
 def getServices(self, organizationId=None, workspaceId=None, serviceId=None, limit=100, cursor=None, filters={}, fields=None):
-    if fields is None: fields = self.getTypeFields("Service")
+    if fields is None: fields = SERVICE_DEFAULT_FIELDS
     fields = "\n".join(fields)
     if filters is None: filters = {}
     response = self.session.post(

{anatools-6.0.1 → anatools-6.0.3}/anatools/anaclient/api/workspaces.py

@@ -2,8 +2,14 @@
 Workspaces API calls.
 """
 
+WORKSPACE_DEFAULT_FIELDS = [
+    "workspaceId", "name", "description", "objective",
+    "organizationId", "organization", "status", "tags",
+    "createdAt", "createdBy", "updatedAt", "updatedBy",
+]
+
 def getWorkspaces(self, organizationId=None, workspaceId=None, cursor=None, limit=100, filters={}, fields=None):
-    if fields is None: fields = self.getTypeFields("Workspace")
+    if fields is None: fields = WORKSPACE_DEFAULT_FIELDS
     fields = "\n".join(fields)
     if filters is None: filters = {}
     response = self.session.post(

{anatools-6.0.1 → anatools-6.0.3}/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.1 → anatools-6.0.3}/anatools/anaclient/volumes.py

@@ -311,35 +311,42 @@ def upload_volume_data(self, volumeId, files=None, localDir=None, destinationDir
         if destinationDir: destinationDir += '/'
 
     source_files = []
+    source_paths = []
     source_hashes = []
     faileduploads = []
-        
+
     if len(files):
         for file in files:
-            filepath = os.path.join(localDir, file)
+            filepath = os.path.join(localDir, file) if not os.path.isabs(file) else file
             if os.path.isdir(filepath):
                 for root, dirs, files in os.walk(filepath):
                     for file in files:
-                        filepath = os.path.join(root, file).replace(localDir, '')
-                        source_files.append(filepath)
+                        local_path = os.path.join(root, file)
+                        relative_name = local_path.replace(localDir, '') if local_path.startswith(localDir) else os.path.relpath(local_path, localDir)
+                        source_files.append(relative_name)
+                        source_paths.append(local_path)
                         if sync == True:
-                            file_hash = generate_etag(os.path.join(root,file))
-                            source_hashes.append(filepath + file_hash)
+                            file_hash = generate_etag(local_path)
+                            source_hashes.append(relative_name + file_hash)
             elif os.path.isfile(filepath):
-                source_files.append(file)
+                upload_name = os.path.basename(file) if os.path.isabs(file) else file
+                source_files.append(upload_name)
+                source_paths.append(filepath)
                 if sync == True:
                     file_hash = generate_etag(filepath)
-                    source_hashes.append(file + file_hash)
+                    source_hashes.append(upload_name + file_hash)
             else:
                 if self.interactive: print(f"Could not find {filepath}.")
     else:
         for root, dirs, files in os.walk(localDir):
             for file in files:
-                filepath = os.path.join(root, file).replace(localDir, '')
-                source_files.append(filepath)
+                local_path = os.path.join(root, file)
+                relative_name = local_path.replace(localDir, '')
+                source_files.append(relative_name)
+                source_paths.append(local_path)
                 if sync == True:
-                    file_hash = generate_etag(os.path.join(root,file))
-                    source_hashes.append(filepath + file_hash)
+                    file_hash = generate_etag(local_path)
+                    source_hashes.append(relative_name + file_hash)
 
     if sync == True:
         response = []
@@ -389,7 +396,7 @@ def upload_volume_data(self, volumeId, files=None, localDir=None, destinationDir
         elif sync == False or (source_hashes[index] not in destination_hashes):
             try:
                 self.refresh_token()
-                filepath = os.path.join(localDir, file)
+                filepath = source_paths[index]
                 filesize = os.path.getsize(filepath)
                 fileinfo = self.ana_api.uploadVolumeData(volumeId=volumeId, key=destination_key, size=filesize)
                 parts = multipart_upload_file(filepath, int(fileinfo["partSize"]), fileinfo["urls"], f"Uploading {file} to the volume [{index+1} / {len(source_files)}]", interactive=self.interactive)

{anatools-6.0.1 → anatools-6.0.3}/anatools/bin/anadeploy

@@ -523,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.1 → anatools-6.0.3}/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