kodexa 7.0.8897197016__tar.gz → 7.0.8901087762__tar.gz

{kodexa-7.0.8897197016 → kodexa-7.0.8901087762}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kodexa
-Version: 7.0.8897197016
+Version: 7.0.8901087762
 Summary: Python SDK for the Kodexa Platform
 Author: Austin Redenbaugh
 Author-email: austin@kodexa.com

{kodexa-7.0.8897197016 → kodexa-7.0.8901087762}/kodexa/platform/client.py

@@ -888,44 +888,6 @@ class OrganizationsEndpoint(EntitiesEndpoint):
             return None
         return organizations.content[0]
 
-    def get_subscriptions(self, page: int = 1, page_size: int = 10) -> "PageProductSubscriptionEndpoint":
-        """
-        Get the subscriptions of the organization.
-
-        Returns:
-            The subscriptions of the organization.
-        """
-        url = f"/api/productSubscriptions"
-        params = {
-            filter: f"organization.id: '{self.organization.id}'",
-        }
-        response = self.client.get(url, params=params)
-
-        from kodexa.model.entities.product_subscription import PageProductSubscriptionEndpoint
-        return PageProductSubscriptionEndpoint.model_validate(response.json()).set_client(self.client)
-
-    def remove_subscription(self, subscription_id: str) -> None:
-        """
-        Remove a subscription from the organization.
-
-        Args:
-            subscription_id (str): The id of the subscription to remove.
-        """
-        url = f"/api/productSubscriptions/{subscription_id}"
-        self.client.delete(url)
-
-    def add_subscription(self, product: "Product") -> None:
-        """
-        Add a subscription to the organization.
-
-        Args:
-            product (Product): The product to subscribe to.
-        """
-        url = f"/api/productSubscriptions"
-        from kodexa.model.entities.product_subscription import ProductSubscription
-        new_product_subscription = ProductSubscription(organization=self.organization, product=product)
-        self.client.post(url, body=new_product_subscription.model_dump_json(by_alias=True))
-
 
 class PageEndpoint(ClientEndpoint):
     """
@@ -1672,6 +1634,45 @@ class OrganizationEndpoint(Organization, EntityEndpoint):
         response = self.client.get(url, params={"page": page, "pageSize": page_size, "query": query})
         return PageAssistantDefinitionEndpoint.model_validate(response.json()).set_client(self.client)
 
+    def get_subscriptions(self, page: int = 1, page_size: int = 10) -> "PageProductSubscriptionEndpoint":
+        """
+        Get the subscriptions of the organization.
+
+        Returns:
+            The subscriptions of the organization.
+        """
+        url = f"/api/productSubscriptions"
+        params = {
+            filter: f"organization.id: '{self.id}'",
+        }
+        response = self.client.get(url, params=params)
+
+        from kodexa.model.entities.product_subscription import PageProductSubscriptionEndpoint
+        return PageProductSubscriptionEndpoint.model_validate(response.json()).set_client(self.client)
+
+    def remove_subscription(self, subscription_id: str) -> None:
+        """
+        Remove a subscription from the organization.
+
+        Args:
+            subscription_id (str): The id of the subscription to remove.
+        """
+        url = f"/api/productSubscriptions/{subscription_id}"
+        self.client.delete(url)
+
+    def add_subscription(self, product: "Product") -> None:
+        """
+        Add a subscription to the organization.
+
+        Args:
+            product (Product): The product to subscribe to.
+        """
+        url = f"/api/productSubscriptions"
+        from kodexa.model.entities.product_subscription import ProductSubscription
+        new_product_subscription = ProductSubscription(organization=self.detach(), product=product)
+        print(new_product_subscription.model_dump_json(by_alias=True))
+        self.client.post(url, body=json.loads(new_product_subscription.model_dump_json(by_alias=True)))
+
 
 class ComponentsEndpoint(ClientEndpoint):
     """
@@ -6127,9 +6128,10 @@ class ExtractionEngineEndpoint:
         """
         response = self.client.post(
             "/api/extractionEngine/extract",
-            data={"taxonomyJson": taxonomy.model_dump_json()},
+            data={"taxonomyJson": taxonomy.model_dump_json(by_alias=True)},
             files={"document": document.to_kddb()},
         )
+        print(response.json())
         return [
             DataObject.model_validate(data_object) for data_object in response.json()
         ]
@@ -6150,7 +6152,7 @@ class ExtractionEngineEndpoint:
         response = self.client.post(
             "/api/extractionEngine/extract",
             params="full",
-            data={"taxonomyJson": taxonomy.model_dump_json()},
+            data={"taxonomyJson": taxonomy.model_dump_json(by_alias=True)},
             files={"document": document.to_kddb()},
         )
         return {
@@ -6181,7 +6183,7 @@ class ExtractionEngineEndpoint:
         response = self.client.post(
             "/api/extractionEngine/extract",
             params={"format": format},
-            data={"taxonomyJson": taxonomy.model_dump_json()},
+            data={"taxonomyJson": taxonomy.model_dump_json(by_alias=True)},
             files={"document": document.to_kddb()},
         )
         return response.text

{kodexa-7.0.8897197016 → kodexa-7.0.8901087762}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kodexa"
-version = "7.0.08897197016"
+version = "7.0.08901087762"
 description = "Python SDK for the Kodexa Platform"
 authors = ["Austin Redenbaugh <austin@kodexa.com>", "Philip Dodds <philip@kodexa.com>", "Romar Cablao <rcablao@kodexa.com>", "Amadea Paula Dodds <amadeapaula@kodexa.com>"]
 readme = "README.md"