Merge pull request #23 from synccomputingcode/graham/python-3.7

PROD-820 Expand supported the library's Python versions to [3.7,3.11]

Author: gseyffert-sync

.github/workflows/pull-request.yml

@@ -14,10 +14,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python 3.10.x
+      - name: Set up Python 3.7.x
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10.9"
+          python-version: "3.7.5"
 
       - name: Install dependencies
         run: pip install .[dev]

.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.7.5"
       - name: Install dependencies
         run: pip install .[dev]
       - name: Build docs

demo/install_cli.sh

@@ -7,7 +7,7 @@ function find_python() {
   local python_candidate
 
   while read python_candidate; do
-    if [[ $("$python_candidate" --version 2>/dev/null) =~ (^|[^[:digit:].])3.10(\.|$) ]]; then
+    if [[ $("$python_candidate" --version 2>/dev/null) =~ (^|[^[:digit:].])3\.(7|8|9|10|11)(\.|$) ]]; then
       echo $python_candidate
       return
     fi

pyproject.toml

@@ -13,7 +13,7 @@ build-backend = "hatchling.build"
 name = "syncsparkpy"
 authors = [{"name" = "Sync Computing"}]
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.7"
 classifiers = [
   "Intended Audience :: Information Technology",
   "Intended Audience :: System Administrators",
@@ -43,7 +43,7 @@ dev = [
   "pytest==7.2.0",
   "pytest-env==0.8.1",
   "pytest-asyncio==0.21.0",
-  "Sphinx==5.3.0",
+  "Sphinx==4.3.0",
   "respx==0.20.1",
   "deepdiff==6.3.0",
 ]
@@ -59,7 +59,7 @@ Home = "https://github.com/synccomputingcode/syncsparkpy"
 
 [tool.black]
 line-length = 100
-target-version = ['py310']
+target-version = ['py37']
 
 [tool.isort]
 profile = "black"

sync/api/predictions.py

@@ -8,14 +8,15 @@
 
 import boto3 as boto
 import httpx
+from typing import List
 
 from sync.clients.sync import get_default_client
 from sync.models import Platform, PredictionError, Response
 
 logger = logging.getLogger(__name__)
 
 
-def get_products() -> Response[list[str]]:
+def get_products() -> Response[List[str]]:
     """Get supported platforms
 
     :return: list of platform names
@@ -43,7 +44,8 @@ def generate_prediction(
     """
     response = create_prediction(platform, cluster_report, eventlog_url)
 
-    if prediction_id := response.result:
+    prediction_id = response.result
+    if prediction_id:
         return wait_for_prediction(prediction_id, preference)
 
     return response
@@ -60,8 +62,8 @@ def wait_for_prediction(prediction_id: str, preference: str = None) -> Response[
     :rtype: Response[dict]
     """
     response = wait_for_final_prediction_status(prediction_id)
-
-    if result := response.result:
+    result = response.result
+    if result:
         if result == "SUCCESS":
             return get_prediction(prediction_id, preference)
 
@@ -84,7 +86,8 @@ def get_prediction(prediction_id: str, preference: str = None) -> Response[dict]
         prediction_id, {"preference": preference} if preference else None
     )
 
-    if result := response.get("result"):
+    result = response.get("result")
+    if result:
         return Response(result=result)
 
     return Response(**response)
@@ -100,15 +103,16 @@ def get_status(prediction_id: str) -> Response[str]:
     """
     response = get_default_client().get_prediction_status(prediction_id)
 
-    if result := response.get("result"):
+    result = response.get("result")
+    if result:
         return Response(result=result["status"])
 
     return Response(**response)
 
 
 def get_predictions(
     product: str = None, project_id: str = None, preference: str = None
-) -> Response[list[dict]]:
+) -> Response[List[dict]]:
     """Get predictions
 
     :param product: platform to filter by, e.g. "aws-emr", defaults to None
@@ -144,8 +148,10 @@ def wait_for_final_prediction_status(prediction_id: str) -> Response[str]:
     :return: prediction status, e.g. "SUCCESS"
     :rtype: Response[str]
     """
-    while response := get_default_client().get_prediction_status(prediction_id):
-        if result := response.get("result"):
+    response = get_default_client().get_prediction_status(prediction_id)
+    while response:
+        result = response.get("result")
+        if result:
             if result["status"] in ("SUCCESS", "FAILURE"):
                 return Response(result=result["status"])
         else:
@@ -154,6 +160,8 @@ def wait_for_final_prediction_status(prediction_id: str) -> Response[str]:
         logger.info("Waiting for prediction")
         sleep(10)
 
+        response = get_default_client().get_prediction_status(prediction_id)
+
     return Response(error=PredictionError(message="Failed to get prediction status"))
 
 
@@ -221,16 +229,16 @@ def create_prediction(
     :return: prediction ID
     :rtype: Response[str]
     """
-    match urlparse(eventlog_url).scheme:
-        case "s3":
-            response = generate_presigned_url(eventlog_url)
-            if response.error:
-                return response
-            eventlog_http_url = response.result
-        case "http" | "https":
-            eventlog_http_url = eventlog_url
-        case _:
-            return Response(error=PredictionError(message="Unsupported event log URL scheme"))
+    scheme = urlparse(eventlog_url).scheme
+    if scheme == "s3":
+        response = generate_presigned_url(eventlog_url)
+        if response.error:
+            return response
+        eventlog_http_url = response.result
+    elif scheme in {"http", "https"}:
+        eventlog_http_url = eventlog_url
+    else:
+        return Response(error=PredictionError(message="Unsupported event log URL scheme"))
 
     response = get_default_client().create_prediction(
         {

sync/api/projects.py

@@ -3,6 +3,8 @@
 
 import logging
 
+from typing import List
+
 from sync.api.predictions import get_predictions
 from sync.clients.sync import get_default_client
 from sync.models import Preference, ProjectError, Response
@@ -21,14 +23,16 @@ def get_prediction(project_id: str, preference: Preference = None) -> Response[d
     :rtype: Response[dict]
     """
     project_response = get_project(project_id)
-    if project := project_response.result:
+    project = project_response.result
+    if project:
         predictions_response = get_predictions(
             project_id=project_id, preference=preference or project.get("preference")
         )
         if predictions_response.error:
             return predictions_response
 
-        if predictions := predictions_response.result:
+        predictions = predictions_response.result
+        if predictions:
             return Response(result=predictions[0])
         return Response(error=ProjectError(message="No predictions in the project"))
     return project_response
@@ -123,13 +127,14 @@ def get_project_by_app_id(app_id: str) -> Response[dict]:
     if response.get("error"):
         return Response(**response)
 
-    if projects := response.get("result"):
+    projects = response.get("result")
+    if projects:
         return Response(result=projects[0])
 
     return Response(error=ProjectError(message=f"No project found for '{app_id}'"))
 
 
-def get_projects(app_id: str = None) -> Response[list[dict]]:
+def get_projects(app_id: str = None) -> Response[List[dict]]:
     """Returns all projects authorized by the API key
 
     :param app_id: app ID to filter by, defaults to None

sync/asyncapi/predictions.py

@@ -2,6 +2,8 @@
 from asyncio import sleep
 from urllib.parse import urlparse
 
+from typing import List
+
 from sync.api.predictions import generate_presigned_url
 from sync.clients.sync import get_default_async_client
 from sync.models import Platform, PredictionError, Response
@@ -27,7 +29,8 @@ async def generate_prediction(
     """
     response = await create_prediction(platform, cluster_report, eventlog_url)
 
-    if prediction_id := response.result:
+    prediction_id = response.result
+    if prediction_id:
         return await wait_for_prediction(prediction_id, preference)
 
     return response
@@ -45,7 +48,8 @@ async def wait_for_prediction(prediction_id: str, preference: str) -> Response[d
     """
     response = await wait_for_final_prediction_status(prediction_id)
 
-    if result := response.result:
+    result = response.result
+    if result:
         if result == "SUCCESS":
             return await get_prediction(prediction_id, preference)
 
@@ -68,15 +72,16 @@ async def get_prediction(prediction_id: str, preference: str = None) -> Response
         prediction_id, {"preference": preference} if preference else None
     )
 
-    if result := response.get("result"):
+    result = response.get("result")
+    if result:
         return Response(result=result)
 
     return Response(**response)
 
 
 async def get_predictions(
     product: str = None, project_id: str = None, preference: str = None
-) -> Response[list[dict]]:
+) -> Response[List[dict]]:
     """Get predictions
 
     :param product: platform to filter by, e.g. "aws-emr", defaults to None
@@ -112,8 +117,10 @@ async def wait_for_final_prediction_status(prediction_id: str) -> Response[str]:
     :return: prediction status, e.g. "SUCCESS"
     :rtype: Response[str]
     """
-    while response := await get_default_async_client().get_prediction_status(prediction_id):
-        if result := response.get("result"):
+    response = await get_default_async_client().get_prediction_status(prediction_id)
+    while response:
+        result = response.get("result")
+        if result:
             if result["status"] in ("SUCCESS", "FAILURE"):
                 return Response(result=result["status"])
         else:
@@ -122,6 +129,8 @@ async def wait_for_final_prediction_status(prediction_id: str) -> Response[str]:
         logger.info("Waiting for prediction")
         await sleep(10)
 
+        response = await get_default_async_client().get_prediction_status(prediction_id)
+
     return Response(error=PredictionError(message="Failed to get prediction status"))
 
 
@@ -141,16 +150,17 @@ async def create_prediction(
     :return: prediction ID
     :rtype: Response[str]
     """
-    match urlparse(eventlog_url).scheme:
-        case "s3":
-            response = generate_presigned_url(eventlog_url)
-            if response.error:
-                return response
-            eventlog_http_url = response.result
-        case "http" | "https":
-            eventlog_http_url = eventlog_url
-        case _:
-            return Response(error=PredictionError(message="Unsupported event log URL scheme"))
+    scheme = urlparse(eventlog_url).scheme
+
+    if scheme == "s3":
+        response = generate_presigned_url(eventlog_url)
+        if response.error:
+            return response
+        eventlog_http_url = response.result
+    elif scheme in {"http", "https"}:
+        eventlog_http_url = eventlog_url
+    else:
+        return Response(error=PredictionError(message="Unsupported event log URL scheme"))
 
     response = await get_default_async_client().create_prediction(
         {

sync/asyncawsemr.py

@@ -36,12 +36,14 @@ async def create_prediction_for_cluster(cluster_id: str, region_name: str = None
     :rtype: Response[str]
     """
     report_response = get_cluster_report(cluster_id, region_name)
-    if cluster_report := report_response.result:
+    cluster_report = report_response.result
+    if cluster_report:
         eventlog_response = _get_eventlog_url_from_cluster_report(cluster_report)
         if eventlog_response.error:
             return eventlog_response
 
-        if eventlog_http_url := eventlog_response.result:
+        eventlog_http_url = eventlog_response.result
+        if eventlog_http_url:
             return await create_prediction(Platform.AWS_EMR, cluster_report, eventlog_http_url)
 
         return eventlog_response