terrakio-core 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

terrakio_core/config.py

@@ -9,51 +9,97 @@ from .exceptions import ConfigurationError
 DEFAULT_CONFIG_FILE = os.path.join(os.environ.get("HOME", ""), ".tkio_config.json")
 DEFAULT_API_URL = "https://api.terrak.io"
 
-def read_config_file(config_file: str = DEFAULT_CONFIG_FILE) -> Dict[str, Any]:
+def read_config_file(config_file: str = DEFAULT_CONFIG_FILE, quiet: bool = False) -> Dict[str, Any]:
     """
     Read and parse the configuration file.
     
     Args:
         config_file: Path to the configuration file
+        quiet: If True, suppress informational messages
         
     Returns:
-        Dict[str, Any]: Configuration parameters
+        Dict[str, Any]: Configuration parameters with additional flags:
+                       'is_logged_in': True if user is logged in
+                       'user_email': The email of the logged in user
+                       'token': Personal token if available
         
-    Raises:
-        ConfigurationError: If the configuration file can't be read or parsed
+    Note:
+        This function no longer raises ConfigurationError. Instead, it creates an empty config
+        file if one doesn't exist and returns appropriate status flags.
     """
     config_path = Path(os.path.expanduser(config_file))
-    
+    # the first circumstance is that the config file does not exist
+    # that we need to login before using any of the functions
+    # Check if config file exists
     if not config_path.exists():
-        raise ConfigurationError(
-            f"Configuration file not found: {config_file}\n"
-            f"Please create a file at {config_file} with the following format:\n"
-            '{\n  "EMAIL": "your-email@example.com",\n  "TERRAKIO_API_KEY": "your-api-key-here"\n}'
-        )
+        # Create an empty config file
+        config_path.parent.mkdir(parents=True, exist_ok=True)
+        with open(config_path, 'w') as f:
+            json.dump({}, f)
+        if not quiet:
+            print("No API key found. Please provide an API key to use this client.")
+        return {
+            'url': DEFAULT_API_URL,
+            'key': None,
+            'is_logged_in': False,
+            'user_email': None,
+            'token': None
+        }
     
     try:
+        # Read the config file
         with open(config_path, 'r') as f:
             config_data = json.load(f)
-            
+        
+        # Read the config file data
+        # Check if config has an API key
+        if not config_data or 'TERRAKIO_API_KEY' not in config_data or not config_data.get('TERRAKIO_API_KEY'):
+            if not quiet:
+                print("No API key found. Please provide an API key to use this client.")
+            return {
+                'url': DEFAULT_API_URL,
+                'key': None,
+                'is_logged_in': False,
+                'user_email': None,
+                'token': config_data.get('PERSONAL_TOKEN')
+            }
+        
+        # If we have config values, use them
+        if not quiet:
+            print(f"Currently logged in as: {config_data.get('EMAIL')}")
+        # this meanb that we have already logged in to the tkio account
+        
         # Convert the JSON config to our expected format
         config = {
-            # Allow config to override default URL if provided
-            'url': config_data.get('TERRAKIO_API_URL', DEFAULT_API_URL),
-            'key': config_data.get('TERRAKIO_API_KEY')
+            # Always use the default URL, not from config file
+            'url': DEFAULT_API_URL,
+            'key': config_data.get('TERRAKIO_API_KEY'),
+            'is_logged_in': True,
+            'user_email': config_data.get('EMAIL'),
+            'token': config_data.get('PERSONAL_TOKEN')
         }
         return config
             
+
     except Exception as e:
-        raise ConfigurationError(f"Failed to parse configuration file: {e}")
+        if not quiet:
+            print(f"Error reading config: {e}")
+            print("No API key found. Please provide an API key to use this client.")
+        return {
+            'url': DEFAULT_API_URL,
+            'key': None,
+            'is_logged_in': False,
+            'user_email': None,
+            'token': None
+        }
 
-def create_default_config(email: str, api_key: str, api_url: Optional[str] = None, config_file: str = DEFAULT_CONFIG_FILE) -> None:
+def create_default_config(email: str, api_key: str, config_file: str = DEFAULT_CONFIG_FILE) -> None:
     """
     Create a default configuration file in JSON format.
     
     Args:
         email: User email
         api_key: Terrakio API key
-        api_url: Optional API URL (if different from default)
         config_file: Path to configuration file
         
     Raises:
@@ -70,10 +116,6 @@ def create_default_config(email: str, api_key: str, api_url: Optional[str] = Non
             "TERRAKIO_API_KEY": api_key
         }
         
-        # Add API URL if provided
-        if api_url:
-            config_data["TERRAKIO_API_URL"] = api_url
-        
         with open(config_path, 'w') as f:
             json.dump(config_data, f, indent=2)
             

terrakio_core/dataset_management.py

@@ -83,10 +83,63 @@ class DatasetManagement:
         except requests.RequestException as e:
             raise APIError(f"Request failed: {str(e)}")
 
+    # def create_dataset(self, name: str, collection: str = "terrakio-datasets", **kwargs) -> Dict[str, Any]:
+    #     """
+    #     Create a new dataset.
+        
+    #     Args:
+    #         name: Name of the dataset (required)
+    #         collection: Dataset collection (default: 'terrakio-datasets')
+    #         **kwargs: Additional dataset parameters including:
+    #             - products: List of products
+    #             - dates_iso8601: List of dates
+    #             - bucket: Storage bucket
+    #             - path: Storage path
+    #             - data_type: Data type
+    #             - no_data: No data value
+    #             - l_max: Maximum level
+    #             - y_size: Y size
+    #             - x_size: X size
+    #             - proj4: Projection string
+    #             - abstract: Dataset abstract
+    #             - geotransform: Geotransform parameters
+                
+    #     Returns:
+    #         Created dataset information
+            
+    #     Raises:
+    #         APIError: If the API request fails
+    #     """
+    #     endpoint = f"{self.api_url}/datasets"
+    #     params = {"collection": collection}
+    #     # Create payload with required name parameter
+    #     payload = {"name": name}
+        
+    #     # Add optional parameters if provided
+    #     for param in ["products", "dates_iso8601", "bucket", "path", "data_type", 
+    #                  "no_data", "l_max", "y_size", "x_size", "proj4", "abstract", "geotransform", "input"]:
+    #         if param in kwargs:
+    #             payload[param] = kwargs[param]
+        
+    #     try:
+    #         response = self.session.post(
+    #             endpoint,
+    #             params=params,
+    #             json=payload,
+    #             timeout=self.timeout,
+    #             verify=self.verify
+    #         )
+            
+    #         if not response.ok:
+    #             raise APIError(f"API request failed: {response.status_code} {response.reason}")
+    #         return response.json()
+    #     except requests.RequestException as e:
+    #         raise APIError(f"Request failed: {str(e)}")
+
     def create_dataset(self, name: str, collection: str = "terrakio-datasets", **kwargs) -> Dict[str, Any]:
         """
         Create a new dataset.
-        
+                    
         Args:
             name: Name of the dataset (required)
             collection: Dataset collection (default: 'terrakio-datasets')
@@ -103,24 +156,23 @@ class DatasetManagement:
                 - proj4: Projection string
                 - abstract: Dataset abstract
                 - geotransform: Geotransform parameters
-                
+                - padding: Padding value
+                            
         Returns:
             Created dataset information
-            
+                        
         Raises:
             APIError: If the API request fails
         """
         endpoint = f"{self.api_url}/datasets"
         params = {"collection": collection}
-        # Create payload with required name parameter
         payload = {"name": name}
-        
-        # Add optional parameters if provided
-        for param in ["products", "dates_iso8601", "bucket", "path", "data_type", 
-                     "no_data", "l_max", "y_size", "x_size", "proj4", "abstract", "geotransform", "input"]:
+                    
+        for param in ["products", "dates_iso8601", "bucket", "path", "data_type",
+                        "no_data", "l_max", "y_size", "x_size", "proj4", "abstract", "geotransform", "input", "padding"]:
             if param in kwargs:
                 payload[param] = kwargs[param]
-        
+                    
         try:
             response = self.session.post(
                 endpoint,
@@ -129,7 +181,7 @@ class DatasetManagement:
                 timeout=self.timeout,
                 verify=self.verify
             )
-            
+                            
             if not response.ok:
                 raise APIError(f"API request failed: {response.status_code} {response.reason}")
             return response.json()

terrakio_core/mass_stats.py

@@ -61,36 +61,89 @@ class MassStats:
         return response
     
 
-    # def _download_file(self, url: str, output_path: str) -> str:
-    #     """
-    #     Helper method to download a file from a signed URL.
+    def download_file(self, job_name: str, bucket:str, file_name: str, output_path: str) -> str:
+        """
+        Download a file from mass_stats using job name and file name.
+        
+        Args:
+            job_name: Name of the job
+            file_name: Name of the file to download
+            output_path: Path where the file should be saved
+            
+        Returns:
+            str: Path to the downloaded file
+        """
+        import os
+        from pathlib import Path
         
-    #     Args:
-    #         url: Signed URL to download from
-    #         output_path: Path where the file should be saved
+        endpoint_url = f"{self.base_url}/mass_stats/download_files"
+        request_body = {
+            "job_name": job_name,
+            "bucket": bucket,
+            "file_name": file_name
+        }
+        
+        try:
+            # Get signed URL
+            response = self.session.post(
+                endpoint_url, 
+                json=request_body, 
+                verify=self.verify, 
+                timeout=self.timeout
+            )
+            signed_url = response.json().get('download_url')
+            if not signed_url:
+                raise Exception("No download URL received from server")    
+            print(f"Generated signed URL for download")
+            
+            # Create output directory if it doesn't exist
+            output_dir = Path(output_path).parent
+            output_dir.mkdir(parents=True, exist_ok=True)
+            
+            # Download the file using the signed URL
+            download_response = self.session.get(
+                signed_url,
+                verify=self.verify,
+                timeout=self.timeout,
+                stream=True  # Stream for large files
+            )
+            download_response.raise_for_status()
+
+            # Check if file exists in the response (content-length header)
+            content_length = download_response.headers.get('content-length')
+            if content_length and int(content_length) == 0:
+                raise Exception("File appears to be empty")
             
-    #     Returns:
-    #         str: Path to the downloaded file
-    #     """
-
-    #     try:
-    #         response = requests.get(
-    #             url,
-    #             verify=self.verify,
-    #             timeout=self.timeout
-    #         )
-    #         response.raise_for_status()
+            # Write the file
+            with open(output_path, 'wb') as file:
+                for chunk in download_response.iter_content(chunk_size=8192):
+                    if chunk:
+                        file.write(chunk)
             
-    #         # Download and write the file
-    #         with open(output_path, 'wb') as file:
-    #             file.write(response.content)
-    #         print(f"File downloaded successfully to {output_path}")    
-    #         return output_path
+            # Verify file was written
+            if not os.path.exists(output_path):
+                raise Exception(f"File was not written to {output_path}")
+                
+            file_size = os.path.getsize(output_path)
+            print(f"File downloaded successfully to {output_path} (size: {file_size / (1024 * 1024):.4f} mb)")
+            
+            return output_path
             
-    #     except requests.exceptions.RequestException as e:
-    #         raise Exception(f"Error downloading file from {url}: {e}")
-    #     except IOError as e:
-    #         raise Exception(f"Error writing file to {output_path}: {e}")
+        except self.session.exceptions.RequestException as e:
+            if hasattr(e, 'response') and e.response is not None:
+                error_detail = e.response.text
+                raise Exception(f"Error getting signed URL: {e}. Details: {error_detail}")
+            raise Exception(f"Error in download process: {e}")
+        except IOError as e:
+            raise Exception(f"Error writing file to {output_path}: {e}")
+        except Exception as e:
+            # Clean up partial file if it exists
+            if os.path.exists(output_path):
+                try:
+                    os.remove(output_path)
+                except:
+                    pass
+            raise
     
 
 
@@ -152,53 +205,7 @@ class MassStats:
             timeout=self.timeout
         )      
         return response.json()
-    
-
-    # def construct_download_url(
-    #     self,
-    #     name: str,
-    #     output: str,
-    #     region: Optional[str] = None,
-    # ) -> Dict[str, Any]:
-    #     """
-    #     Request a signed download URL for a file.
-        
-    #     Args:
-    #         name: job name
-    #         file_type: Type of file to download (e.g., "output", "manifest", "log")
-    #         region: Region where the file is stored
-            
-    #     Returns:
-    #         Dict containing download_url and file metadata
-    #     """
-    #     url = f"{self.base_url}/mass_stats/download"
-        
-    #     data = {
-    #         "name": name,
-    #         "output": output
-    #     }
-        
-    #     if region is not None:
-    #         data["region"] = region
-        
-    #     response = self.session.post(
-    #         url,
-    #         json=data,
-    #         verify=self.verify,
-    #         timeout=self.timeout
-    #     )
-        
-    #     return response.json()
-
 
-    # def testdownload(
-    #     self,
-    #     name: str,
-    #     region: str,
-    #     output: str,
-    # ):
-    #     upload_result = self.construct_download_url(name, region, output)
-    #     return upload_result
 
 
     
@@ -286,7 +293,7 @@ class MassStats:
         if uid is not None:
             url += f"&uid={uid}"
         response = self.session.get(url, verify=self.verify, timeout=self.timeout)
-        print("response text is ", response.text)
+        #print("response text is ", response.text)
         return response.json()
 
     def track_job(self, ids: Optional[list] = None) -> Dict[str, Any]:
@@ -491,6 +498,7 @@ class MassStats:
 
 
 
+  
 
 
     

{terrakio_core-0.3.1.dist-info → terrakio_core-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.3.1
+Version: 0.3.3
 Summary: Core components for Terrakio API clients
 Author-email: Yupeng Chao <yupeng@haizea.com.au>
 Project-URL: Homepage, https://github.com/HaizeaAnalytics/terrakio-python-api
@@ -22,6 +22,7 @@ Requires-Dist: xarray>=2023.1.0
 Requires-Dist: shapely>=2.0.0
 Requires-Dist: geopandas>=0.13.0
 Requires-Dist: google-cloud-storage>=2.0.0
+Requires-Dist: nest_asyncio
 
 # Terrakio Core
 

terrakio_core-0.3.3.dist-info/RECORD

@@ -0,0 +1,16 @@
+terrakio_core/__init__.py,sha256=MhRAUXppa228Lm-kvJGTngU1cUkJF5Q6PIBPwtqxn0E,88
+terrakio_core/auth.py,sha256=tqviZwtW7qWSo1TEjvv0dMDkegUtaEN_tfdrJ6cPJtc,7182
+terrakio_core/client.py,sha256=b76IaqhWYSq2XKgVlj4BQTtCPiBJ2wUNzwiNlVZ3X2k,73860
+terrakio_core/config.py,sha256=MKTGSQRji8ty9dJlX8SOP7_3K2iR-3BXL-hUG7PsZQY,4324
+terrakio_core/dataset_management.py,sha256=Hdk3nkwd70jw3lBNEaGixrqNVhUWOmsIYktzm_8vXdc,10913
+terrakio_core/decorators.py,sha256=QeNOUX6WEAmdgBL5Igt5DXyYduh3jnmLbodttmwvXhE,785
+terrakio_core/exceptions.py,sha256=9S-I20-QiDRj1qgjFyYUwYM7BLic_bxurcDOIm2Fu_0,410
+terrakio_core/group_access_management.py,sha256=NJ7SX4keUzZAUENmJ5L6ynKf4eRlqtyir5uoKFyY17A,7315
+terrakio_core/mass_stats.py,sha256=UGZo8BH4hzWe3k7pevsYAdRwnVZl-08lXjTlHD4nMgQ,18212
+terrakio_core/space_management.py,sha256=wlUUQrlj_4U_Lpjn9lbF5oj0Rv3NPvvnrd5mWej5kmA,4211
+terrakio_core/user_management.py,sha256=MMNWkz0V_9X7ZYjjteuRU4H4W3F16iuQw1dpA2wVTGg,7400
+terrakio_core/generation/tiles.py,sha256=eiiMNzqaga-c42kG_7zHXTF2o8ZInCPUj0Vu4Ye30Ts,2980
+terrakio_core-0.3.3.dist-info/METADATA,sha256=DIKsBR8Uqgt5ExhlwcaPNYXSLxWV3AZMRmkehbmgF3I,1476
+terrakio_core-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+terrakio_core-0.3.3.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
+terrakio_core-0.3.3.dist-info/RECORD,,

terrakio_core-0.3.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-terrakio_core/__init__.py,sha256=279LuD40cJZBle4GQS_vxLIyyfejhEhcl2m9-4Qkdkk,88
-terrakio_core/auth.py,sha256=Nuj0_X3Hiy17svYgGxrSAR-LXpTlP0J0dSrfMnkPUbI,7717
-terrakio_core/client.py,sha256=rTwWP6r_aqEHoVGIpyMsy7pgVoaT2lSLNGpx0jf8QMU,62658
-terrakio_core/config.py,sha256=AwJ1VgR5K7N32XCU5k7_Dp1nIv_FYt8MBonq9yKlGzA,2658
-terrakio_core/dataset_management.py,sha256=LKUESSDPRu1JubQaQJWdPqHLGt-_Xv77Fpb4IM7vkzM,8751
-terrakio_core/decorators.py,sha256=QeNOUX6WEAmdgBL5Igt5DXyYduh3jnmLbodttmwvXhE,785
-terrakio_core/exceptions.py,sha256=9S-I20-QiDRj1qgjFyYUwYM7BLic_bxurcDOIm2Fu_0,410
-terrakio_core/group_access_management.py,sha256=NJ7SX4keUzZAUENmJ5L6ynKf4eRlqtyir5uoKFyY17A,7315
-terrakio_core/mass_stats.py,sha256=HHrpnlshADfCyVMD4VqR3jpIN9jCGnZaFDc_q5igG-Y,17215
-terrakio_core/space_management.py,sha256=wlUUQrlj_4U_Lpjn9lbF5oj0Rv3NPvvnrd5mWej5kmA,4211
-terrakio_core/user_management.py,sha256=MMNWkz0V_9X7ZYjjteuRU4H4W3F16iuQw1dpA2wVTGg,7400
-terrakio_core/generation/tiles.py,sha256=eiiMNzqaga-c42kG_7zHXTF2o8ZInCPUj0Vu4Ye30Ts,2980
-terrakio_core-0.3.1.dist-info/METADATA,sha256=fv09EWJ75yEd2k80SuM0-KKzOeCICvqbnxj9DKTdKrw,1448
-terrakio_core-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-terrakio_core-0.3.1.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
-terrakio_core-0.3.1.dist-info/RECORD,,