terrakio-core 0.4.98.1b7__tar.gz → 0.4.98.1b8__tar.gz

{terrakio_core-0.4.98.1b7 → terrakio_core-0.4.98.1b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.4.98.1b7
+Version: 0.4.98.1b8
 Summary: Core package for the terrakio-python-api
 Requires-Python: >=3.11
 Requires-Dist: aiofiles>=24.1.0

{terrakio_core-0.4.98.1b7 → terrakio_core-0.4.98.1b8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "terrakio-core"
-version = "0.4.98.1b7"
+version = "0.4.98.1b8"
 description = "Core package for the terrakio-python-api"
 readme = "README.md"
 requires-python = ">=3.11"

{terrakio_core-0.4.98.1b7 → terrakio_core-0.4.98.1b8}/terrakio_core/endpoints/mass_stats.py

@@ -1,7 +1,7 @@
 import json
 import os
 import time
-from typing import Dict, Any, Optional, List
+from typing import Dict, Any, Optional, List, Union
 
 import aiohttp
 import typer
@@ -991,10 +991,10 @@ class MassStats:
     async def gen_and_process(
         self,
         collection: str,
-        requests_file: str,
+        requests_file: Union[str, Any],
         output: str,
         folder: str,
-        consumer: str,
+        consumer: Union[str, Any],
         extra: Optional[Dict[str, Any]] = None,
         force_loc: Optional[bool] = False,
         skip_existing: Optional[bool] = True,
@@ -1005,10 +1005,10 @@ class MassStats:
 
         Args:
             collection: Name of collection
-            requests_file: Path to JSON file containing request configurations
+            requests_file: Path to JSON file or file object containing request configurations
             output: Output type (str)
             folder: Folder to store output
-            consumer: Path to post processing script
+            consumer: Path to post processing script or file object
             extra: Additional configuration parameters (optional)
             force_loc: Write data directly to the cloud under this folder (optional, defaults to False)
             skip_existing: Skip existing data (optional, defaults to True)
@@ -1025,25 +1025,39 @@ class MassStats:
 
         upload_urls = await self._upload_requests(collection=collection)
         url = upload_urls['url']
-        await self._upload_file(requests_file, url)
-
-        with open(consumer, 'rb') as f:
-            form = aiohttp.FormData()
-            form.add_field('output', output)
-            form.add_field('force_loc', str(force_loc).lower())
-            form.add_field('skip_existing', str(skip_existing).lower())
-            
-            if server is not None:
-                form.add_field('server', server)
-            
-            form.add_field('extra', json.dumps(extra or {}))
-            form.add_field('folder', folder)
-            form.add_field(
-                'consumer',
-                f.read(),
-                filename='consumer.py',
-                content_type='text/x-python'
-            )
+        
+        # Handle requests_file - either file path (str) or file object
+        if isinstance(requests_file, str):
+            await self._upload_file(requests_file, url)
+        else:
+            # File object - read JSON and upload directly
+            json_data = json.load(requests_file)
+            await self._upload_json_data(json_data, url)
+
+        # Handle consumer - either file path (str) or file object
+        if isinstance(consumer, str):
+            with open(consumer, 'rb') as f:
+                consumer_content = f.read()
+        else:
+            # Assume it's a file object
+            consumer_content = consumer.read()
+        
+        form = aiohttp.FormData()
+        form.add_field('output', output)
+        form.add_field('force_loc', str(force_loc).lower())
+        form.add_field('skip_existing', str(skip_existing).lower())
+        
+        if server is not None:
+            form.add_field('server', server)
+        
+        form.add_field('extra', json.dumps(extra or {}))
+        form.add_field('folder', folder)
+        form.add_field(
+            'consumer',
+            consumer_content,
+            filename='consumer.py',
+            content_type='text/x-python'
+        )
         
         response, status = await self._client._terrakio_request(
             "POST",