terrakio-core 0.4.98.1b15__py3-none-any.whl → 0.5.0__py3-none-any.whl

terrakio_core/__init__.py

@@ -8,7 +8,7 @@ Core components for Terrakio API clients.
 # Suppress ONNX Runtime GPU device discovery warnings - MUST BE FIRST!
 import os
 os.environ['ORT_LOGGING_LEVEL'] = '3'
-__version__ = "0.4.98.1"
+__version__ = "0.5.0"
 
 from .async_client import AsyncClient
 from .sync_client import SyncClient as Client

terrakio_core/endpoints/model_management.py

@@ -4,10 +4,6 @@ import textwrap
 from io import BytesIO
 from typing import Optional, Tuple
 
-import os
-
-os.environ['ORT_LOGGING_LEVEL'] = '3'
-
 import onnxruntime as ort
 
 from ..helper.decorators import require_api_key
@@ -919,13 +915,13 @@ class ModelManagement:
             if not SKL2ONNX_AVAILABLE:
                 raise ImportError("skl2onnx is not installed. Please install it with: pip install skl2onnx")
             return self._convert_sklearn_to_onnx(model, input_shape), "random_forest"
-        # elif isinstance(model, ort.InferenceSession):
-        #     if model_type is None:
-        #         raise ValueError(
-        #             "For ONNX InferenceSession models, you must specify the 'model_type' parameter. Currently 'nerual network' and 'random forest' are supported."
-        #             "Example: model_type='random forest' or model_type='neural network'"
-        #         )
-        #     return model.SerializeToString(), model_type
+        elif isinstance(model, ort.InferenceSession):
+            if model_type is None:
+                raise ValueError(
+                    "For ONNX InferenceSession models, you must specify the 'model_type' parameter. Currently 'nerual network' and 'random forest' are supported."
+                    "Example: model_type='random forest' or model_type='neural network'"
+                )
+            return model.SerializeToString(), model_type
         else:
             model_type = type(model).__name__
             raise ValueError(f"Unsupported model type: {model_type}. Supported types: PyTorch nn.Module, sklearn BaseEstimator")

{terrakio_core-0.4.98.1b15.dist-info → terrakio_core-0.5.0.dist-info}/METADATA

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

{terrakio_core-0.4.98.1b15.dist-info → terrakio_core-0.5.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-terrakio_core/__init__.py,sha256=PfUM3-juKx4e5Qz2EG45lKEDUrplFjc3e42YkXWdm6k,394
+terrakio_core/__init__.py,sha256=WQb8zJ51wFWTjdeYE5ixvTzD49e4bEPMWdSao9VFuZc,391
 terrakio_core/accessors.py,sha256=UZIi9y4RpBxouSmKuwuNYLIYqDxD8BH-GnUzwJuc1JI,47570
 terrakio_core/async_client.py,sha256=aCLjiAmhRS20efrA11hhGUbtwsxapIBp4hBAwG79K6Y,9766
 terrakio_core/client.py,sha256=VXP7BtJWIfpPPZR7_yNdSTcGwNgTwhb7KorusqkQrzk,5603
@@ -8,16 +8,15 @@ terrakio_core/sync_client.py,sha256=m5ybuQdWmjg2lIjWZED91iBXE094lOPGn-S-01ee8w4,
 terrakio_core/convenience_functions/create_dataset_file.py,sha256=RDTAQnKUigyczv3EKhKrs34VMDZDCgL4iz0bge1d9e4,4774
 terrakio_core/convenience_functions/geoquries.py,sha256=7E3drOD5ffNk2-rKLbwKsNp3_Berq-S1lQk5wwHSuAo,3786
 terrakio_core/convenience_functions/zonal_stats.py,sha256=7PI--RI0hiF1pzZ7_7hqtyOMOyw607HvHedD8BnYuJo,26630
-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=KuUaqF9h2z__2UvrFwrVDVB3eXPGTvU8dHjy7NWll1g,42000
-terrakio_core/endpoints/model_management.py,sha256=_vdlG-xYrfcFfQvswS6t0t6LSn4eMmOnNm1mXvxGes0,51405
+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.1b15.dist-info/METADATA,sha256=NUVCbhCvvChBi-sNCHuoE24dQfy97bvnVi_eyHC0TP0,1185
-terrakio_core-0.4.98.1b15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-terrakio_core-0.4.98.1b15.dist-info/RECORD,,
+terrakio_core-0.5.0.dist-info/METADATA,sha256=SJnsWRDoneA--DsWijuJ44dcvbpwNlH7gltmEkT_yiw,1179
+terrakio_core-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+terrakio_core-0.5.0.dist-info/RECORD,,

terrakio_core/endpoints/auth.py

@@ -1,236 +0,0 @@
-import json
-import os
-from typing import Any, Dict
-
-from ..exceptions import (
-    APIKeyError,
-    AuthenticationExpireError,
-    InvalidUsernamePasswordError,
-    LoginError,
-    QuotaError,
-    RefreshAPIKeyError,
-    ResetPasswordError,
-    SignupError,
-    UserInfoError,
-    InvalidEmailFormatError,
-    EmailAlreadyExistsError,
-)
-from ..helper.decorators import require_api_key, require_auth, require_token
-
-class AuthClient:
-    def __init__(self, client):
-        self._client = client
-
-    async def signup(self, email: str, password: str) -> Dict[str, str]:
-        """
-        Signup a new user with email and password.
-
-        Args:
-            email: User's email address
-            password: User's password
-            
-        Returns:
-            Dict containing the authentication token
-            
-        Raises:
-            SignupError: If the signup request fails
-        """
-        payload = {
-            "email": email,
-            "password": password
-        }
-        response, status = await self._client._terrakio_request("POST", "/users/signup", json=payload)
-        if status != 200:
-            if status == 422:
-                raise InvalidEmailFormatError(f"Invalid email format: {response}", status_code=status)
-            elif status == 409:
-                raise EmailAlreadyExistsError(f"Email already exists: {response}", status_code=status)
-            raise SignupError(f"Signup request failed: {response}", status_code=status)
-        else:
-            return response
-
-    async def login(self, email: str, password: str) -> None:
-        """
-        Login a user with email and password.
-        
-        Args:
-            email: User's email address
-            password: User's password
-            
-        Returns:
-            None
-            
-        Raises:
-            APIError: If the login request fails
-        """
-        payload = {
-            "email": email,
-            "password": password
-        }
-        response, status = await self._client._terrakio_request("POST", "/users/login", json=payload)
-        if status != 200:
-            if status == 401:
-                raise InvalidUsernamePasswordError(f"Invalid username or password: {response}", status_code=status)
-            else:
-                raise LoginError(f"Login request failed: {response}", status_code=status)
-        else:
-            token_response = response.get("token")
-            
-            if token_response:
-                self._client.token = token_response
-
-                api_key_response = await self.view_api_key()
-                self._client.key = api_key_response
- 
-                if not self._client.url:
-                    self._client.url = "https://api.terrak.io"
-                
-                self._save_config(email, token_response)
-                
-                self._client.logger.info(f"Successfully authenticated as: {email}")
-                self._client.logger.info(f"Using Terrakio API at: {self._client.url}")
-                
-
-    @require_token
-    async def view_api_key(self) -> str:
-        """
-        View the current API key for the authenticated user.
-        
-        Returns:
-            str: The API key
-            
-        Raises:
-            AuthenticationExpireError: If authentication expired
-            APIKeyError: If the API key request fails
-        """
-        response, status = await self._client._terrakio_request("GET", "/users/key")
-        api_key = response.get("apiKey")
-        if status != 200:
-            if status == 400 and response.get("detail")["message"] == "Not authenticated":
-                raise AuthenticationExpireError(f"Authentication expired, please login again: {response}")
-            else:
-                raise APIKeyError(f"Error fetching API key: {response}", status_code=status)
-        else:
-            return api_key
-
-    @require_api_key
-    @require_token
-    async def refresh_api_key(self) -> str:
-        """
-        Refresh the API key for the authenticated user.
-        
-        Returns:
-            str: The new API key
-            
-        Raises:
-            RefreshAPIKeyError: If the API key refresh request fails
-        """
-        response, status = await self._client._terrakio_request("POST", "/users/refresh_key")
-        self._client.key = response.get("apiKey")
-        if status != 200:
-            raise RefreshAPIKeyError(f"Error refreshing API key: {response}", status_code=status)
-        else:
-            self._update_config_key()
-            return self._client.key
-
-    @require_api_key
-    async def get_user_info(self) -> Dict[str, Any]:
-        """
-        Get information about the authenticated user.
-        
-        Returns:
-            Dict[str, Any]: User information
-            
-        Raises:
-            AuthenticationExpireError: If authentication expired
-            UserInfoError: If the user info request fails
-        """
-        response, status = await self._client._terrakio_request("GET", "/users/info")
-        if status != 200:
-            if status == 400 and response.get("detail")["message"] == "Not authenticated":
-                raise AuthenticationExpireError(f"Authentication expired, please login again: {response}", status_code=status)
-            else:
-                raise UserInfoError(f"Error fetching user info: {response}", status_code=status)
-        else:
-            return response
-    
-    @require_api_key
-    async def reset_password(self, email : str) -> Dict[str, Any]:
-        """
-        Reset the password for a user by email.
-        """
-        response, status = await self._client._terrakio_request("GET", f"/users/reset-password?email={email}")
-        if status != 200:
-            raise ResetPasswordError(f"Error resetting password: {response}", status_code=status)
-        else:
-            return response['message']
-
-    @require_api_key
-    async def get_user_quota(self):
-        """
-        Get the user's quota.
-
-        Returns:
-            Dict: User's quota
-
-        Raises:
-            QuotaError: If the quota request fails
-        """
-        response, status = await self._client._terrakio_request("GET", "/users/quota")
-        if status != 200:
-            raise QuotaError(f"Error fetching quota: {response}", status_code = status)
-        else:
-            return response
-
-    def _save_config(self, email: str, token: str):
-        """
-        Helper method to save config file.
-        
-        Args:
-            email: User's email address
-            token: Authentication token
-        """
-        config_path = os.path.join(os.environ.get("HOME", ""), ".tkio_config.json")
-        
-        try:
-            config = {"EMAIL": email, "TERRAKIO_API_KEY": self._client.key}
-            if os.path.exists(config_path):
-                with open(config_path, 'r') as f:
-                    config = json.load(f)
-                    
-            config["EMAIL"] = email
-            config["TERRAKIO_API_KEY"] = self._client.key
-            config["PERSONAL_TOKEN"] = token
-            os.makedirs(os.path.dirname(config_path), exist_ok=True)
-            with open(config_path, 'w') as f:
-                json.dump(config, f, indent=4)
-                
-            self._client.logger.info(f"API key saved to {config_path}")
-            
-        except Exception as e:
-            self._client.logger.info(f"Warning: Failed to update config file: {e}")
-
-    def _update_config_key(self):
-        """
-        Helper method to update just the API key in config.
-        """
-        config_path = os.path.join(os.environ.get("HOME", ""), ".tkio_config.json")
-        
-        try:
-            config = {"EMAIL": "", "TERRAKIO_API_KEY": ""}
-            
-            if os.path.exists(config_path):
-                with open(config_path, 'r') as f:
-                    config = json.load(f)
-                    
-            config["TERRAKIO_API_KEY"] = self._client.key
-            
-            os.makedirs(os.path.dirname(config_path), exist_ok=True)
-            
-            with open(config_path, 'w') as f:
-                json.dump(config, f, indent=4)
-                
-            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}")