terrakio-core 0.4.98.1b7__py3-none-any.whl → 0.4.98.1b8__py3-none-any.whl

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",

{terrakio_core-0.4.98.1b7.dist-info → terrakio_core-0.4.98.1b8.dist-info}/METADATA

@@ -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.dist-info → terrakio_core-0.4.98.1b8.dist-info}/RECORD

@@ -11,13 +11,13 @@ terrakio_core/convenience_functions/zonal_stats.py,sha256=7PI--RI0hiF1pzZ7_7hqty
 terrakio_core/endpoints/auth.py,sha256=5WvAO39aLsbJAVtxISwiOZseKr3B9I5tHjamPRehDBQ,8327
 terrakio_core/endpoints/dataset_management.py,sha256=jpwftiKOI59NhXXypqm6wtILIkfyjy9NfYifRIvhZS0,16791
 terrakio_core/endpoints/group_management.py,sha256=V0KOGTXwmePBFeym55G_m3ONR-jVj2IU4OVLiL5UKz4,15869
-terrakio_core/endpoints/mass_stats.py,sha256=6BVD6aVXcG9t-yOjPyTpwsNM5ScoYCAYnoUWl76Cqdw,41460
+terrakio_core/endpoints/mass_stats.py,sha256=6RFKR2qjz8uawA1Hb10yIX6bbr-D5dnhSN6uW8Ak8gI,42032
 terrakio_core/endpoints/model_management.py,sha256=tvJ4BOBsyXKKH430byGH25CkLIzXWgxaPaL0CvL8_0Y,51341
 terrakio_core/endpoints/space_management.py,sha256=YWb55nkJnFJGlALJ520DvurxDqVqwYtsvqQPWzxzhDs,2266
 terrakio_core/endpoints/user_management.py,sha256=L_g4ysrh2xyz_JbObUU_tCxgHxisrDUPntWgQOs15GE,7709
 terrakio_core/helper/bounded_taskgroup.py,sha256=wiTH10jhKZgrsgrFUNG6gig8bFkUEPHkGRT2XY7Rgmo,677
 terrakio_core/helper/decorators.py,sha256=L6om7wmWNgCei3Wy5U0aZ-70OzsCwclkjIf7SfQuhCg,2289
 terrakio_core/helper/tiles.py,sha256=lcLCO6KiP05lCI9vngo3zCZJ6Z9C0pUxHSQS4H58EHc,2699
-terrakio_core-0.4.98.1b7.dist-info/METADATA,sha256=TRow24aLBbKOYmCNkUOO2V7qMlhqC5s2HS2lfgIyMqA,1184
-terrakio_core-0.4.98.1b7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-terrakio_core-0.4.98.1b7.dist-info/RECORD,,
+terrakio_core-0.4.98.1b8.dist-info/METADATA,sha256=Akksg8XAe3QgpcEBKsMCAK2wLw10Q3ds7XNWq3lWIEY,1184
+terrakio_core-0.4.98.1b8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+terrakio_core-0.4.98.1b8.dist-info/RECORD,,