alpha-python 0.2.0__tar.gz → 0.2.2__tar.gz

{alpha_python-0.2.0 → alpha_python-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.2.0
+Version: 0.2.2
 Summary: Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction.
 Author-email: Bart Reijling <bart@reijling.eu>
 Requires-Python: >=3.11
@@ -18,7 +18,7 @@ Requires-Dist: sqlalchemy>=2.0.44
 Requires-Dist: requests>=2.28.1
 Requires-Dist: dependency-injector<5.0.0,>=4.48.3
 Provides-Extra: api-generator
-Requires-Dist: openapi-generator-cli==7.14.0; extra == "api-generator"
+Requires-Dist: openapi-generator-cli==7.14.0; (python_version >= "3.11" and python_version < "4.0") and extra == "api-generator"
 Requires-Dist: jdk4py; extra == "api-generator"
 Provides-Extra: flask
 Requires-Dist: connexion[swagger-ui]<3,>=2.14.2; extra == "flask"

{alpha_python-0.2.0 → alpha_python-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alpha-python"
-version = "0.2.0"
+version = "0.2.2"
 description = "Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction."
 readme = "README.md"
 authors = [
@@ -34,9 +34,9 @@ where = ["src"]
 include-package-data = true
 
 [tool.setuptools.package-data]
-"alpha.handlers.api.templates" = [
-    "python-flask/*.mustache",
-    "python-flask/**/*.mustache",
+"alpha.handlers" = [
+    "**/*.mustache",
+    "*.sh",
 ]
 
 [build-system]
@@ -60,7 +60,7 @@ dev = [
 
 [project.optional-dependencies]
 api-generator = [
-    "openapi-generator-cli==7.14.0",
+    "openapi-generator-cli==7.14.0 ; python_version >= '3.11' and python_version < '4.0'",
     "jdk4py"
 ]
 flask = [

{alpha_python-0.2.0 → alpha_python-0.2.2}/src/alpha/cli.py

@@ -1,6 +1,7 @@
 import argparse
 import os
 import sys
+import tomllib
 from dependency_injector.wiring import Provide, inject
 
 from alpha.containers.container import Container
@@ -105,29 +106,41 @@ def main(sections: list[Section] = Provide[Container.sections]) -> None:
     return
 
 
-def _guess_current_package_name() -> str | None:
-    """Guess the name of the package where you are generating the API for,
-    finding the first (and only) folder in the 'src'-folder.
+def _guess_current_package_name() -> str:
+    """Guess the name of the python package where you are generating the API
+    for. If a pyproject.toml file can be found the name is read from there. If
+    not, it looks for a subfolder which contains a python package.
 
     Returns
     -------
     str
-        _description_
+        The guessed package name.
     """
+
     cwd = os.getcwd()
-    package_location = f'{cwd}/src'
-    if not os.path.isdir(package_location):
-        return 'None'
-    package_names = [
-        name
-        for name in os.listdir(package_location)
-        if os.path.isdir(os.path.join(package_location, name))
-        and not name.startswith('.')
-        and not name.endswith('.egg-info')
-    ]
-    if len(package_names) == 0:
-        return None
-    return package_names[0]
+    pyproject_path = os.path.join(cwd, 'pyproject.toml')
+
+    # look for pyproject.toml file in subfolders
+    if not os.path.isfile(pyproject_path):
+        for entry in os.scandir(cwd):
+            if not entry.is_dir():
+                continue
+            possible_path = os.path.join(entry.path, 'pyproject.toml')
+            if os.path.isfile(possible_path):
+                pyproject_path = possible_path
+                break
+
+    if os.path.isfile(pyproject_path):
+        try:
+            with open(pyproject_path, 'rb') as f:
+                pyproject_data = tomllib.load(f)
+                return pyproject_data['project']['name'].replace('-', '_')
+        except Exception:
+            pass
+
+    # Fallback to use the current folder name
+    print('Could not find pyproject.toml, guessing package name from folder')
+    return os.path.basename(cwd)
 
 
 def init() -> None:

{alpha_python-0.2.0 → alpha_python-0.2.2}/src/alpha/containers/container.py

@@ -1,7 +1,7 @@
 from dependency_injector import containers, providers
 
-from alpha.handlers.api.api_generate_handler import ApiGenerateHandler
-from alpha.handlers.api.api_run_handler import ApiRunHandler
+from alpha.handlers.api_generate_handler import ApiGenerateHandler
+from alpha.handlers.api_run_handler import ApiRunHandler
 from alpha.handlers.models.command import Command
 from alpha.handlers.models.section import Section
 from alpha.handlers.models.argument import Argument

alpha_python-0.2.2/src/alpha/handlers/gen-code.sh

@@ -0,0 +1,28 @@
+echo ${PACKAGE_NAME}
+
+if ! command -v openapi-generator-cli 2>&1 >/dev/null
+then
+    echo "The 'openapi-generator-cli' command could not be found"
+    echo "Please install it by installing alpha-python with the 'api-generator' extras:"
+    echo "eg. 'pip install alpha-python[api-generator]'"
+    exit 1
+fi
+
+# Validate spec
+openapi-generator-cli validate \
+    --input-spec ${WORKING_DIR}/${SPEC_FILE}
+
+# Generate code
+openapi-generator-cli generate \
+    --input-spec ${WORKING_DIR}/${SPEC_FILE} \
+    --generator-name ${GENERATOR_NAME} \
+    --output ${WORKING_DIR}/api \
+    --template-dir ${WORKING_DIR}/templates \
+    --package-name ${PACKAGE_NAME} \
+    $RESERVED_WORDS_MAPPINGS \
+    --additional-properties featureCORS=true \
+    --additional-properties languageCode=en \
+    --additional-properties servicePackage=${SERVICE_PACKAGE} \
+    --additional-properties containerImport="${CONTAINER_IMPORT}" \
+    --additional-properties initContainerFrom="${INIT_CONTAINER_FROM}" \
+    --additional-properties initContainerFunction="${INIT_CONTAINER_FUNCTION}" \

alpha_python-0.2.2/src/alpha/handlers/run-api.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if ! pip show "connexion" > /dev/null 2>&1
+then
+  echo "The 'connexion' package is not installed."
+  echo "Please install it by installing alpha-python with the 'flask' extras:"
+  echo "eg. 'pip install alpha-python[flask]'"
+  exit 1
+fi
+
+echo "Starting server on port ${PORT}..."
+python ${API_LOCATION}/${PACKAGE_NAME}/__main__.py --port ${PORT}

{alpha_python-0.2.0 → alpha_python-0.2.2}/src/alpha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.2.0
+Version: 0.2.2
 Summary: Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction.
 Author-email: Bart Reijling <bart@reijling.eu>
 Requires-Python: >=3.11
@@ -18,7 +18,7 @@ Requires-Dist: sqlalchemy>=2.0.44
 Requires-Dist: requests>=2.28.1
 Requires-Dist: dependency-injector<5.0.0,>=4.48.3
 Provides-Extra: api-generator
-Requires-Dist: openapi-generator-cli==7.14.0; extra == "api-generator"
+Requires-Dist: openapi-generator-cli==7.14.0; (python_version >= "3.11" and python_version < "4.0") and extra == "api-generator"
 Requires-Dist: jdk4py; extra == "api-generator"
 Provides-Extra: flask
 Requires-Dist: connexion[swagger-ui]<3,>=2.14.2; extra == "flask"

{alpha_python-0.2.0 → alpha_python-0.2.2}/src/alpha_python.egg-info/SOURCES.txt

@@ -30,39 +30,40 @@ src/alpha/factories/type_factories.py
 src/alpha/factories/models/__init__.py
 src/alpha/factories/models/factory_classes.py
 src/alpha/handlers/__init__.py
+src/alpha/handlers/api_generate_handler.py
+src/alpha/handlers/api_run_handler.py
 src/alpha/handlers/base_handler.py
-src/alpha/handlers/api/__init__.py
-src/alpha/handlers/api/api_generate_handler.py
-src/alpha/handlers/api/api_run_handler.py
-src/alpha/handlers/api/templates/__init__.py
-src/alpha/handlers/api/templates/python-flask/Dockerfile.mustache
-src/alpha/handlers/api/templates/python-flask/README.mustache
-src/alpha/handlers/api/templates/python-flask/__init__model.mustache
-src/alpha/handlers/api/templates/python-flask/__init__test.mustache
-src/alpha/handlers/api/templates/python-flask/__main__.mustache
-src/alpha/handlers/api/templates/python-flask/base_model.mustache
-src/alpha/handlers/api/templates/python-flask/controller.mustache
-src/alpha/handlers/api/templates/python-flask/controller_test.mustache
-src/alpha/handlers/api/templates/python-flask/dockerignore.mustache
-src/alpha/handlers/api/templates/python-flask/encoder.mustache
-src/alpha/handlers/api/templates/python-flask/git_push.sh.mustache
-src/alpha/handlers/api/templates/python-flask/gitignore.mustache
-src/alpha/handlers/api/templates/python-flask/model.mustache
-src/alpha/handlers/api/templates/python-flask/openapi.mustache
-src/alpha/handlers/api/templates/python-flask/param_type.mustache
-src/alpha/handlers/api/templates/python-flask/requirements.mustache
-src/alpha/handlers/api/templates/python-flask/security_controller_.mustache
-src/alpha/handlers/api/templates/python-flask/setup.mustache
-src/alpha/handlers/api/templates/python-flask/test-requirements.mustache
-src/alpha/handlers/api/templates/python-flask/tox.mustache
-src/alpha/handlers/api/templates/python-flask/travis.mustache
-src/alpha/handlers/api/templates/python-flask/typing_utils.mustache
-src/alpha/handlers/api/templates/python-flask/util.mustache
+src/alpha/handlers/gen-code.sh
+src/alpha/handlers/run-api.sh
 src/alpha/handlers/models/__init__.py
 src/alpha/handlers/models/argument.py
 src/alpha/handlers/models/command.py
 src/alpha/handlers/models/section.py
 src/alpha/handlers/models/subparser.py
+src/alpha/handlers/templates/__init__.py
+src/alpha/handlers/templates/python-flask/Dockerfile.mustache
+src/alpha/handlers/templates/python-flask/README.mustache
+src/alpha/handlers/templates/python-flask/__init__model.mustache
+src/alpha/handlers/templates/python-flask/__init__test.mustache
+src/alpha/handlers/templates/python-flask/__main__.mustache
+src/alpha/handlers/templates/python-flask/base_model.mustache
+src/alpha/handlers/templates/python-flask/controller.mustache
+src/alpha/handlers/templates/python-flask/controller_test.mustache
+src/alpha/handlers/templates/python-flask/dockerignore.mustache
+src/alpha/handlers/templates/python-flask/encoder.mustache
+src/alpha/handlers/templates/python-flask/git_push.sh.mustache
+src/alpha/handlers/templates/python-flask/gitignore.mustache
+src/alpha/handlers/templates/python-flask/model.mustache
+src/alpha/handlers/templates/python-flask/openapi.mustache
+src/alpha/handlers/templates/python-flask/param_type.mustache
+src/alpha/handlers/templates/python-flask/requirements.mustache
+src/alpha/handlers/templates/python-flask/security_controller_.mustache
+src/alpha/handlers/templates/python-flask/setup.mustache
+src/alpha/handlers/templates/python-flask/test-requirements.mustache
+src/alpha/handlers/templates/python-flask/tox.mustache
+src/alpha/handlers/templates/python-flask/travis.mustache
+src/alpha/handlers/templates/python-flask/typing_utils.mustache
+src/alpha/handlers/templates/python-flask/util.mustache
 src/alpha/infra/__init__.py
 src/alpha/infra/connectors/__init__.py
 src/alpha/infra/connectors/ldap_connector.py

{alpha_python-0.2.0 → alpha_python-0.2.2}/src/alpha_python.egg-info/requires.txt

@@ -11,9 +11,11 @@ requests>=2.28.1
 dependency-injector<5.0.0,>=4.48.3
 
 [api-generator]
-openapi-generator-cli==7.14.0
 jdk4py
 
+[api-generator:python_version >= "3.11" and python_version < "4.0"]
+openapi-generator-cli==7.14.0
+
 [flask]
 connexion[swagger-ui]<3,>=2.14.2
 swagger-ui-bundle>=0.0.2