alpha-python 0.2.1__tar.gz → 0.2.3__tar.gz

{alpha_python-0.2.1 → alpha_python-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.2.1
+Version: 0.2.3
 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.1 → alpha_python-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alpha-python"
-version = "0.2.1"
+version = "0.2.3"
 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 = [
@@ -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.1 → alpha_python-0.2.3}/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.1 → alpha_python-0.2.3}/src/alpha/handlers/templates/python-flask/__main__.mustache

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
+import argparse
 import logging
+import os
 import socket
 
 import connexion

{alpha_python-0.2.1 → alpha_python-0.2.3}/src/alpha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.2.1
+Version: 0.2.3
 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.1 → alpha_python-0.2.3}/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