terrakio-core 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

terrakio_core/endpoints/auth.py

@@ -177,4 +177,11 @@ class AuthClient:
             self._client.logger.info(f"API key updated in {config_path}")
             
         except Exception as e:
-            self._client.logger.info(f"Warning: Failed to update config file: {e}")
+            self._client.logger.info(f"Warning: Failed to update config file: {e}")
+
+
+# we have four different circumstances:
+# same expression, different region
+# same expression, same region
+# different expression, same region
+# different expression, different region

terrakio_core/endpoints/mass_stats.py

@@ -16,7 +16,7 @@ class MassStats:
         self,
         name: str,
         size: int,
-        region: str,
+        sample: str,
         output: str,
         config: Dict[str, Any],
         overwrite: bool = False,
@@ -31,7 +31,7 @@ class MassStats:
         Args:
             name: The name of the job
             size: The size of the job
-            region: The region of the job
+            sample: The sample expression for deciding which server to make the request to
             output: The output of the job
             config: The config of the job
             overwrite: Whether to overwrite the job
@@ -46,10 +46,11 @@ class MassStats:
         Raises:
             APIError: If the API request fails
         """
+        # we don't actually need the region function inside the request, the endpoint will fix that for us
         payload = {
             "name": name,
             "size": size,
-            "region": region,
+            "sample": sample,
             "output": output,
             "config": config,
             "overwrite": overwrite,
@@ -396,7 +397,7 @@ class MassStats:
     async def execute_job(
         self, 
         name: str, 
-        region: str, 
+        # region: str, 
         output: str, 
         config: Dict[str, Any],
         request_json: str,  # Path to request JSON file
@@ -411,7 +412,6 @@ class MassStats:
         
         Args:
             name: The name of the job
-            region: The region of the job
             output: The output of the job
             config: The config of the job
             request_json: Path to the request JSON file
@@ -466,11 +466,16 @@ class MassStats:
         except Exception as e:
             raise ValueError(f"Error extracting manifest from request JSON: {e}")
         
+        # Extract the first expression
+        first_request = request_data[0]  # Changed from data[0] to request_data[0]
+        first_expression = first_request["request"]["expr"]
+        
         # Get upload URLs
         upload_result = await self._upload_request(
             name=name, 
             size=size, 
-            region=region, 
+            # region=region, 
+            sample = first_expression,
             output=output, 
             config=config, 
             location=location, 
@@ -552,7 +557,7 @@ class MassStats:
         tile_size: int,
         res: float,
         output: str,
-        region: str,
+        # region: str,
         year_range: list[int] = None,
         overwrite: bool = False,
         server: str = None,
@@ -570,7 +575,6 @@ class MassStats:
             tile_size: The tile size of the job
             res: The resolution of the job
             output: The output of the job
-            region: The region of the job
             year_range: The year range of the job
             overwrite: Whether to overwrite the job
             server: The server to use
@@ -596,7 +600,7 @@ class MassStats:
         payload_mapping = {
             "year_range": year_range,
             "server": server,
-            "region": region,
+            # "region": region,
             "bucket": bucket,
         }
         for key, value in payload_mapping.items():