cecil 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

cecil/client.py

@@ -6,6 +6,7 @@ import requests
 import snowflake.connector
 from pydantic import BaseModel
 from requests import auth
+from cryptography.hazmat.primitives import serialization
 
 from .errors import (
     Error,
@@ -20,13 +21,14 @@ from .models import (
     DataRequest,
     DataRequestCreate,
     OrganisationCreate,
+    OrganisationSettings,
     RecoverAPIKey,
     RecoverAPIKeyRequest,
     RotateAPIKey,
     RotateAPIKeyRequest,
     SignUpRequest,
     SignUpResponse,
-    SnowflakeCredentials,
+    SnowflakeUserCredentials,
     Transformation,
     TransformationCreate,
     User,
@@ -41,7 +43,7 @@ class Client:
         self._base_url = (
             "https://api.cecil.earth" if env is None else f"https://{env}.cecil.earth"
         )
-        self._snowflake_creds = None
+        self._snowflake_user_creds = None
 
     def create_aoi(self, name: str, geometry: Dict) -> AOI:
         # TODO: validate geometry
@@ -93,14 +95,19 @@ class Client:
         return [Transformation(**record) for record in res["records"]]
 
     def query(self, sql: str) -> pd.DataFrame:
-        if self._snowflake_creds is None:
-            res = self._get(url="/v0/data-access-credentials")
-            self._snowflake_creds = SnowflakeCredentials(**res)
+        if self._snowflake_user_creds is None:
+            res = self._get(url="/v0/snowflake-user-credentials")
+            self._snowflake_user_creds = SnowflakeUserCredentials(**res)
+
+        private_key = serialization.load_pem_private_key(
+            self._snowflake_user_creds.private_key.get_secret_value().encode(),
+            password=None,
+        )
 
         with snowflake.connector.connect(
-            account=self._snowflake_creds.account.get_secret_value(),
-            user=self._snowflake_creds.user.get_secret_value(),
-            password=self._snowflake_creds.password.get_secret_value(),
+            account=self._snowflake_user_creds.account.get_secret_value(),
+            user=self._snowflake_user_creds.user.get_secret_value(),
+            private_key=private_key,
         ) as conn:
             df = conn.cursor().execute(sql).fetch_pandas_all()
             df.columns = [x.lower() for x in df.columns]
@@ -154,6 +161,23 @@ class Client:
         res = self._get(url="/v0/users")
         return [User(**record) for record in res["records"]]
 
+    def get_organisation_settings(self) -> OrganisationSettings:
+        res = self._get(url="/v0/organisation/settings")
+        return OrganisationSettings(**res)
+
+    def update_organisation_settings(
+        self,
+        *,
+        monthly_data_request_limit,
+    ) -> OrganisationSettings:
+        res = self._post(
+            url="/v0/organisation/settings",
+            model=OrganisationSettings(
+                monthly_data_request_limit=monthly_data_request_limit,
+            ),
+        )
+        return OrganisationSettings(**res)
+
     def _request(self, method: str, url: str, skip_auth=False, **kwargs) -> Dict:
 
         if skip_auth is False:

cecil/models.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Dict
+from typing import Dict, Optional
 
 from pydantic import BaseModel, ConfigDict, SecretStr
 from pydantic.alias_generators import to_camel
@@ -41,6 +41,11 @@ class OrganisationCreate(BaseModel):
     name: str
 
 
+class OrganisationSettings(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+    monthly_data_request_limit: Optional[int] = None
+
+
 class RecoverAPIKey(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
     message: str
@@ -77,11 +82,11 @@ class TransformationCreate(BaseModel):
     spatial_resolution: float
 
 
-class SnowflakeCredentials(BaseModel):
+class SnowflakeUserCredentials(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
     account: SecretStr
     user: SecretStr
-    password: SecretStr
+    private_key: SecretStr
 
 
 class User(BaseModel):

cecil/version.py

@@ -1 +1 @@
-__version__ = "0.0.17"
+__version__ = "0.0.19"

{cecil-0.0.17.dist-info → cecil-0.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecil
-Version: 0.0.17
+Version: 0.0.19
 Summary: Python SDK for Cecil Earth
 License-Expression: MIT
 License-File: LICENSE.txt

cecil-0.0.19.dist-info/RECORD

@@ -0,0 +1,9 @@
+cecil/__init__.py,sha256=AEcRl73BDSAQe6W0d1PDD87IEcumARtREl7dCVa_YQY,86
+cecil/client.py,sha256=XYfXnF2eydWIU0Gla4R4VEImlNoZP8t47-A2f4ym3B8,7861
+cecil/errors.py,sha256=ZNiSTYH2MgNZ7tNIgV07-Ge3KtmdncfzWiBi9yjURGs,1818
+cecil/models.py,sha256=7J-qnJWoPH_u9JQPWrGLOpAJU0uVD-FstPMF95KMuTk,3024
+cecil/version.py,sha256=AixLlU6Em9Z_zs4l1lTxAHg1b8pa8z3BTNKIHDkjBmo,23
+cecil-0.0.19.dist-info/METADATA,sha256=8o9ZKdTU_HSOdBtZADjHEXtTI6xZKZg8JKgxM_cyrbs,2659
+cecil-0.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cecil-0.0.19.dist-info/licenses/LICENSE.txt,sha256=mUexcmfYx3bG1VIzAdQTOf_NzStYw6-QkKVdUY_d4i4,1066
+cecil-0.0.19.dist-info/RECORD,,

cecil-0.0.17.dist-info/RECORD

@@ -1,9 +0,0 @@
-cecil/__init__.py,sha256=AEcRl73BDSAQe6W0d1PDD87IEcumARtREl7dCVa_YQY,86
-cecil/client.py,sha256=n8Ft-K1XLt430RCM6jUgBwWhwQlCJT8umyZp6RKpIyw,7054
-cecil/errors.py,sha256=ZNiSTYH2MgNZ7tNIgV07-Ge3KtmdncfzWiBi9yjURGs,1818
-cecil/models.py,sha256=0n5q7oUA7khdc5eB6C8aSW6Yx5LgyN_fA-GHb8y9Z7M,2834
-cecil/version.py,sha256=WlMBNrzKywm5RAbqEVgEgcG7Opc4cf3-wpAnO8PdoEI,23
-cecil-0.0.17.dist-info/METADATA,sha256=pK-PX-p6uyf-_MNbICW_ukGHnKzdnHiSFz5pFW3dOLw,2659
-cecil-0.0.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cecil-0.0.17.dist-info/licenses/LICENSE.txt,sha256=mUexcmfYx3bG1VIzAdQTOf_NzStYw6-QkKVdUY_d4i4,1066
-cecil-0.0.17.dist-info/RECORD,,