fix: make build work with python 3.11 again (#91)

* fix: make build work with python 3.11 again

* chore: black (version update)

* chore: fix versioning

Author: jbristow

.github/workflows/ci.yml

@@ -16,13 +16,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.13"
+          python-version: "3.11"
           cache: 'poetry'
       - name: Install Dependencies
         run: |
           pip install --upgrade pip
           pip install --upgrade setuptools
-          poetry env use "3.13"
+          poetry env use "3.11"
           poetry install
       - name: Run Lints
         run: |

nodestream_akamai/akamai_utils/addresses.py

@@ -1,4 +1,5 @@
 """Common utils for getting information about addresses."""
+
 from enum import StrEnum
 from ipaddress import IPv4Address, IPv6Address, ip_address
 

nodestream_akamai/akamai_utils/cloudlets_v2_client.py

@@ -109,16 +109,17 @@ def get_policy_rule_set(self, policy):
                         policy["policyId"], policy["version"]
                     )
                     policy["id"] = f"akamai_redirect:{policy['policyId']}"
-                    policy[
-                        "inbound_hosts"
-                    ] = self.search_akamai_ruleset_for_inbound_hosts(raw_ruleset)
-                    policy[
-                        "outbound_hosts"
-                    ] = self.search_akamai_ruleset_for_outbound_hosts(raw_ruleset)
-                    policy[
-                        "deeplink"
-                    ] = deeplink_prefix + "{p}/versions?gid={g}&shared=false".format(
-                        p=policy["policyId"], g=policy["groupId"]
+                    policy["inbound_hosts"] = (
+                        self.search_akamai_ruleset_for_inbound_hosts(raw_ruleset)
+                    )
+                    policy["outbound_hosts"] = (
+                        self.search_akamai_ruleset_for_outbound_hosts(raw_ruleset)
+                    )
+                    policy["deeplink"] = (
+                        deeplink_prefix
+                        + "{p}/versions?gid={g}&shared=false".format(
+                            p=policy["policyId"], g=policy["groupId"]
+                        )
                     )
                     policy_list.append(policy)
         except Exception as e:

nodestream_akamai/edgeworkers/edgeworkers.py

@@ -31,9 +31,9 @@ async def extract_records(self):
                 )
 
             # Add deeplink
-            edgeworker[
-                "deeplink"
-            ] = f'https://control.akamai.com/apps/edgeworkers/#/ids/{edgeworker["edgeWorkerId"]}/versions'
+            edgeworker["deeplink"] = (
+                f'https://control.akamai.com/apps/edgeworkers/#/ids/{edgeworker["edgeWorkerId"]}/versions'
+            )
 
             if active_version is not None:
                 edgeworker["activeVersion"] = active_version["version"]

nodestream_akamai/edns/edns.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 
 from nodestream.pipeline.extractors import Extractor
@@ -38,7 +37,7 @@ def _extract_recordset(self, recordset, zone):
                 recordset[node_type] = node_type_list
         return recordset
 
-    async def _extract_zone(self, zone):
+    def _extract_zone(self, zone):
         try:
             record_sets = self.client.list_recordsets(zone["zone"])
         except Exception as e:
@@ -62,5 +61,5 @@ async def extract_records(self):
             self.logger.exception("problem fetching zones: %s", e)
             raise e
 
-        for zone in asyncio.as_completed(self._extract_zone(z) for z in zones):
-            yield await zone
+        for zone in zones:
+            yield self._extract_zone(zone)

nodestream_akamai/iam_clients/iam_clients.py

@@ -19,10 +19,10 @@ async def extract_records(self):
 
         for client in clients:
             client["authorizedUsersList"] = ",".join(client["authorizedUsers"])
-            client[
-                "deeplink"
-            ] = "https://control.akamai.com/apps/identity-management/#/tabs/users/list/api-client/{id}/details".format(
-                id=client["clientId"]
+            client["deeplink"] = (
+                "https://control.akamai.com/apps/identity-management/#/tabs/users/list/api-client/{id}/details".format(
+                    id=client["clientId"]
+                )
             )
             if client["activeCredentialCount"] > 0:
                 try:

nodestream_akamai/siteshield/siteshield.py

@@ -21,7 +21,7 @@ async def extract_records(self):
             deeplink_prefix = (
                 "https://control.akamai.com/apps/siteshield-ui/#/mapRequest/"
             )
-            siteshield_map[
-                "deeplink"
-            ] = f'{deeplink_prefix}{siteshield_map["latestTicketId"]}/status'
+            siteshield_map["deeplink"] = (
+                f'{deeplink_prefix}{siteshield_map["latestTicketId"]}/status'
+            )
             yield siteshield_map