synapse-sdk 1.0.0a43__tar.gz → 1.0.0a45__tar.gz

{synapse_sdk-1.0.0a43/synapse_sdk.egg-info → synapse_sdk-1.0.0a45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0a43
+Version: 1.0.0a45
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT

{synapse_sdk-1.0.0a43 → synapse_sdk-1.0.0a45}/synapse_sdk/plugins/categories/export/actions/export.py

@@ -1,4 +1,3 @@
-import json
 from abc import ABC, abstractmethod
 from datetime import datetime
 from typing import Annotated, Any, Literal
@@ -33,7 +32,7 @@ class ExportRun(Run):
         """Log export file information.
 
         Args:
-            log_type (str): The type of log ('export_data_file' or 'export_origin_file').
+            log_type (str): The type of log ('export_data_file' or 'export_original_file').
             target_id (int): The ID of the data file.
             data_file_info (dict): The JSON info of the data file.
             status (ExportStatus): The status of the data file.
@@ -44,7 +43,7 @@ class ExportRun(Run):
             log_type,
             self.DataFileLog(
                 target_id=target_id,
-                data_file_info=json.dumps(data_file_info),
+                data_file_info=data_file_info,
                 status=status.value,
                 error=error,
                 created=now,
@@ -69,7 +68,7 @@ class ExportRun(Run):
         error: str | None = None,
     ):
         """Log export origin data file."""
-        self.log_file('export_origin_file', target_id, data_file_info, status, error)
+        self.log_file('export_original_file', target_id, data_file_info, status, error)
 
 
 class ExportTargetHandler(ABC):

{synapse_sdk-1.0.0a43 → synapse_sdk-1.0.0a45}/synapse_sdk/plugins/categories/export/templates/plugin/export.py

@@ -140,7 +140,7 @@ def save_as_json(run, result, base_path, error_file_list):
     # Default save file name: original file name
     file_name = get_original_file_pathlib(result['files']).stem
     json_data = result['data']
-    file_info = {'file_name': file_name}
+    file_info = {'file_name': f'{file_name}.json'}
     error_msg = ''
     try:
         with (base_path / f'{file_name}.json').open('w', encoding='utf-8') as f:

{synapse_sdk-1.0.0a43 → synapse_sdk-1.0.0a45}/synapse_sdk/plugins/categories/upload/templates/config.yaml

@@ -4,3 +4,5 @@ actions:
     options:
       allow_generate_tasks: false
       allow_generate_ground_truths: false
+    ui_schema: |
+      Dumped FormKit Schema for upload plugin custom options

{synapse_sdk-1.0.0a43 → synapse_sdk-1.0.0a45}/synapse_sdk/utils/http.py

@@ -3,6 +3,7 @@ import os
 import tempfile
 import threading
 import time
+import uuid
 from contextlib import contextmanager
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 
@@ -17,23 +18,32 @@ class SingleFileHttpServer(SimpleHTTPRequestHandler):
     regardless of the request path.
     """
 
-    def __init__(self, *args, file_path=None, content_type=None, **kwargs):
+    def __init__(self, *args, file_path=None, content_type=None, random_path=None, **kwargs):
         self.file_path = file_path
         self.content_type = content_type
+        self.random_path = random_path
         super().__init__(*args, **kwargs)
 
     def do_GET(self):
         """Handle GET requests by serving the single file."""
         try:
-            # Always serve the specified file regardless of the path requested
-            self.send_response(200)
-            if self.content_type:
-                self.send_header('Content-type', self.content_type)
-            self.send_header('Content-Length', str(os.path.getsize(self.file_path)))
-            self.end_headers()
-
-            with open(self.file_path, 'rb') as file:
-                self.wfile.write(file.read())
+            # Check if the path matches our random path
+            if self.random_path and self.path == f'/{self.random_path}':
+                self.send_response(200)
+                if self.content_type:
+                    self.send_header('Content-type', self.content_type)
+                self.send_header('Content-Length', str(os.path.getsize(self.file_path)))
+                self.end_headers()
+
+                with open(self.file_path, 'rb') as file:
+                    self.wfile.write(file.read())
+            elif self.path == '/':
+                # Redirect root to the random path
+                self.send_response(302)
+                self.send_header('Location', f'/{self.random_path}')
+                self.end_headers()
+            else:
+                self.send_error(404, 'File not found')
 
         except Exception as e:
             self.send_error(500, str(e))
@@ -68,8 +78,11 @@ def temp_file_server(image=None, file_path=None, format='JPEG', host='0.0.0.0',
         port = get_available_ports_host(start_port=8991, end_port=8999)
 
     temp_dir = None
+    temp_file_path = None
 
     try:
+        random_filename = f'{uuid.uuid4().hex}'
+
         if image is not None:
             temp_dir = tempfile.mkdtemp()
             ext_map = {'JPEG': '.jpg', 'PNG': '.png', 'GIF': '.gif', 'WEBP': '.webp'}
@@ -82,9 +95,15 @@ def temp_file_server(image=None, file_path=None, format='JPEG', host='0.0.0.0',
             temp_file_path = os.path.join(temp_dir, f'temp_image{ext}')
             image.save(temp_file_path, format=format)
             file_path = temp_file_path
+            random_filename += ext
+        else:
+            _, ext = os.path.splitext(file_path)
+            random_filename += ext
 
         def handler(*args, **kwargs):
-            return SingleFileHttpServer(*args, file_path=file_path, content_type=content_type, **kwargs)
+            return SingleFileHttpServer(
+                *args, file_path=file_path, content_type=content_type, random_path=random_filename, **kwargs
+            )
 
         server = HTTPServer((host, port), handler)
 
@@ -92,10 +111,9 @@ def temp_file_server(image=None, file_path=None, format='JPEG', host='0.0.0.0',
         server_thread.daemon = True
         server_thread.start()
 
-        url = f'http://localhost:{port}'
+        url = f'http://localhost:{port}/{random_filename}'
 
-        timeout = time.time() + 10
-        while time.time() < timeout:
+        while True:
             try:
                 response = requests.get(url)
                 if response.status_code == 200:

{synapse_sdk-1.0.0a43 → synapse_sdk-1.0.0a45/synapse_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0a43
+Version: 1.0.0a45
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT