python3-core-api-client 0.2__tar.gz → 0.4__tar.gz

{python3_core_api_client-0.2 → python3_core_api_client-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 0.2
+Version: 0.4
 Summary: Python client for Core API.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-core-api-client

{python3_core_api_client-0.2 → python3_core_api_client-0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-core-api-client"
-version = "0.2"
+version = "0.4"
 description = "Python client for Core API."
 readme = "README.md"
 authors = [

python3_core_api_client-0.4/src/cyberfusion/CoreApiClient/_encoders.py

@@ -0,0 +1,14 @@
+import datetime
+from json import JSONEncoder
+from ipaddress import IPv4Address, IPv6Address
+from typing import Any
+
+
+class CustomEncoder(JSONEncoder):
+    def default(self, o: Any) -> str:
+        if isinstance(o, datetime.date):
+            return o.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
+        elif isinstance(o, (IPv6Address, IPv4Address)):
+            return str(o)
+
+        return super().default(o)

{python3_core_api_client-0.2 → python3_core_api_client-0.4}/src/cyberfusion/CoreApiClient/connector.py

@@ -1,7 +1,7 @@
 import json
 from typing import Optional, Tuple
 
-from cyberfusion.CoreApiClient._encoders import DatetimeEncoder
+from cyberfusion.CoreApiClient._encoders import CustomEncoder
 from cyberfusion.CoreApiClient.exceptions import CallException, AuthenticationException
 
 from requests.sessions import Session
@@ -108,13 +108,13 @@ class CoreApiClient:
         url = "".join([self.base_url, path])
 
         if data and content_type == "application/json":
-            data = json.dumps(data, cls=DatetimeEncoder)
+            data = json.dumps(data, cls=CustomEncoder)
 
         if query_parameters:
             for key, value in query_parameters.items():
                 if isinstance(value, datetime.datetime):
                     query_parameters[key] = json.loads(
-                        json.dumps(value, cls=DatetimeEncoder)
+                        json.dumps(value, cls=CustomEncoder)
                     )
 
         requests_response = self.requests_session.request(

{python3_core_api_client-0.2 → python3_core_api_client-0.4}/src/cyberfusion/CoreApiClient/models.py

@@ -1110,7 +1110,7 @@ class HTTPRetryConditionEnum(StrEnum):
     EMPTY_RESPONSE = "Empty response"
     JUNK_RESPONSE = "Junk response"
     RESPONSE_TIMEOUT = "Response timeout"
-    FIELD_0_RTT_REJECTED = "0-RTT rejected"
+    ZERO_RTT_REJECTED = "0-RTT rejected"
     HTTP_STATUS_401 = "HTTP status 401"
     HTTP_STATUS_403 = "HTTP status 403"
     HTTP_STATUS_404 = "HTTP status 404"
@@ -1856,11 +1856,11 @@ class TokenTypeEnum(StrEnum):
 
 
 class TombstoneDataCertificate(CoreApiModel):
-    data_type: Literal["certificate"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["certificate"] = Field(..., title="Data Type")
 
 
 class TombstoneDataCron(CoreApiModel):
-    data_type: Literal["cron"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["cron"] = Field(..., title="Data Type")
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
@@ -1868,14 +1868,14 @@ class TombstoneDataCron(CoreApiModel):
 
 
 class TombstoneDataDaemon(CoreApiModel):
-    data_type: Literal["daemon"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["daemon"] = Field(..., title="Data Type")
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
 
 
 class TombstoneDataFPMPool(CoreApiModel):
-    data_type: Literal["fpm_pool"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["fpm_pool"] = Field(..., title="Data Type")
     version: str = Field(..., title="Version")
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
@@ -1883,7 +1883,7 @@ class TombstoneDataFPMPool(CoreApiModel):
 
 
 class TombstoneDataMailAccount(CoreApiModel):
-    data_type: Literal["mail_account"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["mail_account"] = Field(..., title="Data Type")
     local_part: constr(regex=r"^[a-z0-9-.]+$", min_length=1, max_length=64) = Field(
         ...,
         description="May not be in use by mail alias in the same mail domain.",
@@ -1894,14 +1894,14 @@ class TombstoneDataMailAccount(CoreApiModel):
 
 
 class TombstoneDataPassengerApp(CoreApiModel):
-    data_type: Literal["passenger_app"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["passenger_app"] = Field(..., title="Data Type")
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
 
 
 class TombstoneDataRedisInstance(CoreApiModel):
-    data_type: Literal["redis_instance"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["redis_instance"] = Field(..., title="Data Type")
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
@@ -1909,22 +1909,20 @@ class TombstoneDataRedisInstance(CoreApiModel):
 
 
 class TombstoneDataUNIXUser(CoreApiModel):
-    data_type: Literal["unix_user"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["unix_user"] = Field(..., title="Data Type")
     home_directory: str = Field(..., title="Home Directory")
     delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
 
 
 class TombstoneDataUNIXUserRabbitMQCredentials(CoreApiModel):
-    data_type: Literal["unix_user_rabbitmq_credentials"] = Field(
-        ..., const=True, title="Data Type"
-    )
+    data_type: Literal["unix_user_rabbitmq_credentials"] = Field(..., title="Data Type")
     rabbitmq_virtual_host_name: constr(
         regex=r"^[a-z0-9-.]+$", min_length=1, max_length=32
     ) = Field(..., title="Rabbitmq Virtual Host Name")
 
 
 class TombstoneDataVirtualHost(CoreApiModel):
-    data_type: Literal["virtual_host"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["virtual_host"] = Field(..., title="Data Type")
     domain_root: str = Field(..., title="Domain Root")
     delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
 
@@ -1934,7 +1932,7 @@ class TombstoneIncludes(CoreApiModel):
 
 
 class TombstoneDataDatabase(CoreApiModel):
-    data_type: Literal["database"] = Field(..., const=True, title="Data Type")
+    data_type: Literal["database"] = Field(..., title="Data Type")
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63) = Field(
         ..., title="Name"
     )

{python3_core_api_client-0.2 → python3_core_api_client-0.4}/src/python3_core_api_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 0.2
+Version: 0.4
 Summary: Python client for Core API.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-core-api-client

python3_core_api_client-0.2/src/cyberfusion/CoreApiClient/_encoders.py

@@ -1,7 +0,0 @@
-import datetime
-from json import JSONEncoder
-
-
-class DatetimeEncoder(JSONEncoder):
-    def default(self, o: datetime.datetime) -> str:
-        return o.strftime("%Y-%m-%dT%H:%M:%S.%fZ")