pyixapi 0.1.4__tar.gz → 0.2.1__tar.gz

{pyixapi-0.1.4 → pyixapi-0.2.1}/.github/workflows/publish.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Build package
       run: python -m build
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@c7f29f7adef1a245bd91520e94867e5c6eedddcc
+      uses: pypa/gh-action-pypi-publish@b7f401de30cb6434a1e19f805ff006643653240e
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

{pyixapi-0.1.4/pyixapi.egg-info → pyixapi-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyixapi
-Version: 0.1.4
+Version: 0.2.1
 Summary: IX-API client library
 Home-page: https://github.com/peering-manager/pyixapi
 Author: Guillaume Mazoyer

{pyixapi-0.1.4 → pyixapi-0.2.1}/pyixapi/core/api.py

@@ -24,13 +24,12 @@ from pyixapi.models import (
     PoP,
     Port,
     PortReservation,
-    Product,
     ProductOffering,
     Role,
     RoleAssignment,
 )
 
-__version__ = "0.1.4"
+__version__ = "0.2.1"
 
 
 class API(object):
@@ -61,7 +60,6 @@ class API(object):
         self.auth = Endpoint(self, "auth")
         self.connections = Endpoint(self, "connections", model=Connection)
         self.contacts = Endpoint(self, "contacts", model=Contact)
-        self.customers = Endpoint(self, "customers", model=Account)
         self.demarcs = Endpoint(self, "demarcs", model=Demarc)
         self.devices = Endpoint(self, "devices", model=Device)
         self.facilities = Endpoint(self, "facilities", model=Facility)
@@ -76,7 +74,6 @@ class API(object):
         )
         self.network_services = Endpoint(self, "network-services", model=NetworkService)
         self.pops = Endpoint(self, "pops", model=PoP)
-        self.products = Endpoint(self, "products", model=Product)
         # Version 2+
         self.member_joining_rules = Endpoint(
             self, "member-joining-rules", model=MemberJoiningRule
@@ -89,9 +86,6 @@ class API(object):
         self.port_reservations = Endpoint(
             self, "port-reservations", model=PortReservation
         )
-        self.product_offerings = Endpoint(
-            self, "product-offerings", model=ProductOffering
-        )
         self.roles = Endpoint(self, "roles", model=Role)
         self.role_assignments = Endpoint(self, "role-assignments", model=RoleAssignment)
 
@@ -104,6 +98,20 @@ class API(object):
             base=self.url, token=self.access_token, http_session=self.http_session
         ).get_version()
 
+    @property
+    def accounts(self):
+        return Endpoint(
+            self, "customers" if self.version == 1 else "accounts", model=Account
+        )
+
+    @property
+    def product_offerings(self):
+        return Endpoint(
+            self,
+            "products" if self.version == 1 else "product-offerings",
+            model=ProductOffering,
+        )
+
     def authenticate(self):
         """
         Authenticate and generate a pair of tokens.

{pyixapi-0.1.4 → pyixapi-0.2.1}/pyixapi/core/endpoint.py

@@ -80,3 +80,18 @@ class Endpoint(object):
                 return None
             else:
                 raise e
+
+    def create(self, *args, **kwargs):
+        """
+        Creates an object on an endpoint.
+
+        Allows for the creation of new objects on an endpoint. Named arguments are
+        converted to JSON properties, and a single object is created.
+        """
+        req = Request(
+            base=self.url,
+            token=self.api.access_token,
+            http_session=self.api.http_session,
+        ).post(args[0] if args else kwargs)
+
+        return self.return_obj(req, self.api, self)

{pyixapi-0.1.4 → pyixapi-0.2.1}/pyixapi/core/response.py

@@ -296,7 +296,7 @@ class Record(object):
             r = Request(
                 key=self.id,
                 base=self.endpoint.url,
-                token=self.api.token,
+                token=self.api.access_token,
                 http_session=self.api.http_session,
             )
             if r.patch(updates):
@@ -322,7 +322,7 @@ class Record(object):
         r = Request(
             key=self.id,
             base=self.endpoint.url,
-            token=self.api.token,
+            token=self.api.access_token,
             http_session=self.api.http_session,
         )
         return True if r.delete() else False

{pyixapi-0.1.4 → pyixapi-0.2.1}/pyixapi/models.py

@@ -154,10 +154,11 @@ class PoP(Record):
         return self.name
 
 
-class Product(Record):
+class ProductOffering(Record):
     """
-    A Product is a network or peering-related product of a defined type sold by an IXP
-    to its customers.
+    A ProductOffering is an offer made by an exchange to be consumed by a client.
+
+    It is also referenced as "product" in IX-API v1.
     """
 
     def __str__(self):
@@ -226,15 +227,6 @@ class PortReservation(Record):
         return self.id
 
 
-class ProductOffering(Record):
-    """
-    A ProductOffering is an offer made by an exchange to be consumed by a client.
-    """
-
-    def __str__(self):
-        return self.name
-
-
 class Role(Record):
     """
     A Role enables a Contact to act for a specific purpose.

{pyixapi-0.1.4 → pyixapi-0.2.1/pyixapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyixapi
-Version: 0.1.4
+Version: 0.2.1
 Summary: IX-API client library
 Home-page: https://github.com/peering-manager/pyixapi
 Author: Guillaume Mazoyer

{pyixapi-0.1.4 → pyixapi-0.2.1}/pyixapi.egg-info/requires.txt

@@ -1,2 +1,2 @@
 requests<3.0,>=2.20.0
-PyJWT<2.7,>=2.4.0
+PyJWT<2.9,>=2.4.0

pyixapi-0.2.1/requirements-dev.txt

@@ -0,0 +1,2 @@
+black~=23.7
+pytest==7.4.*

{pyixapi-0.1.4 → pyixapi-0.2.1}/requirements.txt

@@ -1,2 +1,2 @@
-PyJWT>=2.4.0,<2.7
+PyJWT>=2.4.0,<2.9
 requests>=2.20.0,<3.0

{pyixapi-0.1.4 → pyixapi-0.2.1}/setup.py

@@ -18,7 +18,7 @@ setup(
     use_scm_version=True,
     setup_requires=["setuptools_scm"],
     packages=find_packages(exclude=["tests", "tests.*"]),
-    install_requires=["requests>=2.20.0,<3.0", "PyJWT>=2.4.0,<2.7"],
+    install_requires=["requests>=2.20.0,<3.0", "PyJWT>=2.4.0,<2.9"],
     zip_safe=False,
     keywords=["ix-api", "internet-exchange", "peering"],
     classifiers=[

pyixapi-0.1.4/requirements-dev.txt

@@ -1,2 +0,0 @@
-black~=23.1
-pytest==7.2.*