Merge pull request #8 from Roborian/release-0.1.3

Update OutsetaPy package version to 0.1.3 and refactor code structure

Author: savelkouls

.gitignore

@@ -4,3 +4,4 @@ dist/
 build/
 .env
 private.md
+src/outsetapy.egg-info/

pyproject.toml

@@ -1,57 +1,24 @@
 [project]
 name = "outsetapy"
-version = "0.1.1"
+version = "0.1.3"
+
 authors = [
   { name="Roborian, Inc", email="info@roborian.com" },
 ]
 description = "A SDK for building applications with Outseta"
 readme = "README.md"
-long_description = """
-# OutsetaPy : Outseta SDK for python
-
-We created a Outseta SKD because we truely believe that outseta is the best membership management platorm in existance.
-
-## Installation
-
-pip install outsetapy
-
-## Usage
-
-OutsetaPy is a asynchronious library, so it has to run inside a async thread.
-See ./examples/ to learn how to use it
-
-## API Reference
-
-Comming soon
-
-## Contributing
-
-Provide guidelines on how to contribute to your project.
+requires-python = ">=3.8"
 
-### Code formatting>
-
-we use black to perform automatic code formatting, and flake8 for linting
-
-## License
-
-GNU AGPLv3
-
-## Contact and Support
-
-Support options can be found on our [Patreon](https://www.patreon.com/savelkouls) 
-If you are developing a startup, and need help with the development of your product? Send us a message on info@roborian.com and we will be able to help you with it.
-"""
-requires-python = ">=3.7"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
 
-[build-system]
-requires = ["setuptools", "wheel", "requests"]
-build-backend = "setuptools.build_meta"
-
 [project.urls]
 Homepage = "https://github.com/Roborian/outsetapy"
-Issues = "https://github.com/Roborian/outsetapy/issues"
+Issues = "https://github.com/Roborian/outsetapy/issues"
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta" 

src/outsetapy/api/billing/invoices.py

@@ -6,17 +6,13 @@
 from outsetapy.models.billing.invoice import Invoice
 from outsetapy.models.billing.subscription import Subscription
 from outsetapy.models.billing.invoice_line_item import InvoiceLineItem
-from typing import List, Union
-from datetime import date
-from outsetapy.models.billing.subscription import Subscription
-from outsetapy.models.billing.invoice_line_item import InvoiceLineItem
 
 
 class Invoices:
     def __init__(self, store: Store):
         self.store = store
 
-    async def add(self, invoice: dict) -> Union[Invoice, ValidationError[Invoice]]:
+    async def add(self, invoice: dict) -> Invoice:
         request = (
             Request(self.store, "billing/invoices")
             .authenticate_as_server()
@@ -25,11 +21,11 @@ async def add(self, invoice: dict) -> Union[Invoice, ValidationError[Invoice]]:
         response = await request.post()
 
         if response.status == 400:
-            raise Exception(response.json())
+            raise ValidationError(response.json())
         elif response.ok:
-            return response.json()
+            return Invoice(response.json())
         else:
-            raise response
+            raise Exception(response.json())
 
     async def get_by_id(self, invoice_id: str) -> Invoice:
         request = Request(

src/outsetapy/api/billing/subscriptions.py

@@ -1,12 +1,9 @@
-from outsetapy.models.billing.subscription_add_on import SubscriptionAddOn
 from outsetapy.models.billing.plan_family import PlanFamily
 from outsetapy.util.store import Store
 from outsetapy.models.wrappers.validation_error import ValidationError
 from outsetapy.util.request import Request, hasMoreResults
 from outsetapy.models.billing.subscription import Subscription
-from outsetapy.models.billing.plan import Plan
 from outsetapy.models.crm.account import Account
-from outsetapy.models.billing.billing_renewal_term import BillingRenewalTerm
 from outsetapy.models.wrappers.list import List
 from outsetapy.models.billing.charge_summary import ChargeSummary
 
@@ -72,7 +69,7 @@ async def get(self, uid: str, options: dict = {}) -> Subscription:
 
     async def add(
         self, subscription: dict
-    ) -> Subscription | ValidationError[Subscription]:
+    ) -> Subscription:
         request = (
             Request(self.store, "billing/subscriptions/firsttimesubscription")
             .authenticate_as_server()

src/outsetapy/api/crm/accounts.py

@@ -1,6 +1,5 @@
 from datetime import datetime
 from typing import List, Union
-from outsetapy.models.wrappers.list import List
 from outsetapy.models.crm.account import Account
 from outsetapy.util.request import Request, hasMoreResults
 from outsetapy.models.crm.account_stage import AccountStage

src/outsetapy/api/crm/activities.py

@@ -1,7 +1,5 @@
 from typing import Union
-from outsetapy.models.shared.entity import EntityType
 from outsetapy.models.crm.activity import Activity
-from outsetapy.models.crm.activity_type import ActivityType
 from outsetapy.models.wrappers.list import List
 from outsetapy.models.wrappers.validation_error import ValidationError
 from outsetapy.util.request import Request, hasMoreResults

src/outsetapy/api/crm/people.py

@@ -2,7 +2,6 @@
 from outsetapy.models.crm.person import Person
 from outsetapy.util.request import Request, hasMoreResults
 from outsetapy.models.wrappers.list import List
-from outsetapy.models.wrappers.validation_error import ValidationError
 
 
 class People:

src/outsetapy/api/support/cases.py

@@ -1,8 +1,6 @@
 from typing import Union
-from outsetapy.models.crm.person import Person
 from outsetapy.models.support.case import Case
 from outsetapy.models.support.case_history import CaseHistory
-from outsetapy.models.support.case_source import CaseSource
 from outsetapy.models.wrappers.list import List
 from outsetapy.models.wrappers.validation_error import ValidationError
 from outsetapy.util.request import Request, hasMoreResults

src/outsetapy/api/user/password.py

@@ -1,7 +1,6 @@
 from outsetapy.util.request import Request
 from outsetapy.util.store import Store
 from outsetapy.models.wrappers.validation_error import ValidationError
-from outsetapy.models.crm.person import Person
 
 
 class Password:
@@ -19,7 +18,7 @@ async def update(self, existing_password: str, new_password: str) -> None:
         response = await request.put()
 
         if response.status == 400:
-            raise Exception(response.json())
+            raise ValidationError(response.json())
         elif response.ok:
             return None
         else:

src/outsetapy/models/billing/invoice.py

@@ -1,4 +1,3 @@
-from .invoice_line_item import InvoiceLineItem
 from .subscription import Subscription