alpha-python 0.3.0__tar.gz → 0.3.2__tar.gz

{alpha_python-0.3.0 → alpha_python-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.3.0
+Version: 0.3.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
@@ -16,7 +16,7 @@ Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: six>=1.17.0
 Requires-Dist: sqlalchemy>=2.0.44
 Requires-Dist: requests>=2.28.1
-Requires-Dist: dependency-injector<5.0.0,>=4.48.3
+Requires-Dist: dependency-injector[yaml]<5.0.0,>=4.48.3
 Provides-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"

{alpha_python-0.3.0 → alpha_python-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alpha-python"
-version = "0.3.0"
+version = "0.3.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 = [
@@ -18,7 +18,7 @@ dependencies = [
     "six>=1.17.0",
     "sqlalchemy>=2.0.44",
     "requests>=2.28.1",
-    "dependency-injector (>=4.48.3,<5.0.0)",
+    "dependency-injector[yaml]>=4.48.3,<5.0.0",
 ]
 
 [project.scripts]

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha/__init__.py

@@ -5,7 +5,6 @@ from alpha.factories.model_class_factory import ModelClassFactory
 from alpha.domain.models.user import User
 from alpha.domain.models.base_model import BaseDomainModel, DomainModel
 from alpha.domain.models.life_cycle_base import LifeCycleBase
-from alpha.infra.connectors.ldap_connector import LDAPConnector
 from alpha.infra.connectors.oidc_connector import (
     OIDCConnector,
     KeyCloakOIDCConnector,
@@ -43,7 +42,6 @@ from alpha.providers.models.identity import (
 )
 from alpha.providers.models.credentials import PasswordCredentials
 from alpha.providers.models.token import Token
-from alpha.providers.ldap_provider import LDAPProvider, ADProvider
 from alpha.providers.oidc_provider import OIDCProvider, KeyCloakProvider
 from alpha.repositories.models.repository_model import RepositoryModel
 from alpha.repositories.sql_alchemy_repository import SqlAlchemyRepository
@@ -58,10 +56,16 @@ from alpha.utils.logging_level_checker import logging_level_checker
 from alpha.utils.response_object import create_response_object
 from alpha.utils.verify_identity import verify_identity
 from alpha.utils.version_checker import minor_version_gte
-
-
 from alpha.encoder import JSONEncoder
 
+# Optional LDAP support - only import if ldap3 is available
+try:
+    from alpha.infra.connectors.ldap_connector import LDAPConnector  # noqa: F401
+    from alpha.providers.ldap_provider import LDAPProvider, ADProvider  # noqa: F401
+    _LDAP_AVAILABLE = True
+except ImportError:
+    _LDAP_AVAILABLE = False # type: ignore
+
 __all__ = [
     "SqlAlchemyUnitOfWork",
     "JWTFactory",
@@ -71,7 +75,6 @@ __all__ = [
     "DomainModel",
     "LifeCycleBase",
     "User",
-    "LDAPConnector",
     "OIDCConnector",
     "KeyCloakOIDCConnector",
     "SqlAlchemyDatabase",
@@ -106,8 +109,6 @@ __all__ = [
     "AD_SEARCH_ATTRIBUTES",
     "PasswordCredentials",
     "Token",
-    "LDAPProvider",
-    "ADProvider",
     "OIDCProvider",
     "KeyCloakProvider",
     "RepositoryModel",
@@ -123,3 +124,12 @@ __all__ = [
     "minor_version_gte",
     "JSONEncoder",
 ]
+
+
+# Conditionally add LDAP-related exports if available
+if _LDAP_AVAILABLE:
+    __all__.extend([
+        "LDAPConnector",
+        "LDAPProvider",
+        "ADProvider",
+    ])

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha/handlers/api_generate_handler.py

@@ -5,8 +5,6 @@ import subprocess
 import time
 from typing import Any, Optional
 
-# import yaml
-
 from alpha.handlers.base_handler import BaseHandler
 from alpha.exceptions import InvalidArgumentsException
 
@@ -17,6 +15,19 @@ class ApiGenerateHandler(BaseHandler):
     """
 
     def __init__(self) -> None:
+        try:
+            import openapi_generator_cli  # type: ignore # noqa: F401
+        except ImportError:
+            print(
+                "OpenAPI Generator CLI is not installed. Please install "
+                "the required packages first. \nThis can be done by installing "
+                "the \'api-generator\' extra: \n"
+                "- pip install alpha-python[api-generator]\n"
+                "- poetry add alpha-python --extras api-generator\n"
+                "- uv add alpha-python --extra api-generator"
+            )
+            exit(1)
+        
         self.spec_file = None
         self.api_package = None
         self.service_package = None
@@ -173,29 +184,6 @@ class ApiGenerateHandler(BaseHandler):
         else:
             print(f'No post process file ({self.post_process_file}) found')
 
-    # def _generate_configuration(self) -> None:
-    #     """Generate permission.yaml file for the /configuration endpoint."""
-
-    #     PERMISSION_FILE = (
-    #         f'{self.cwd}/api/{self.api_package}/config/permissions.yaml'
-    #     )
-    #     os.makedirs(os.path.dirname(PERMISSION_FILE), exist_ok=True)
-
-    #     permissions = {}
-    #     with open(str(self.spec_file), 'r') as stream:
-    #         try:
-    #             data = yaml.safe_load(stream)
-    #             parser = YamlParser()
-    #             permissions = {  # type: ignore
-    #                 'version': data['info']['version'],
-    #                 'endpoints': parser.parse_endpoints(data),
-    #             }
-    #         except yaml.YAMLError as exc:
-    #             print(exc)
-
-    #     with open(PERMISSION_FILE, 'w+') as file:
-    #         yaml.dump(data=permissions, stream=file)
-
     def _copy_templates(self) -> None:
         """Copy mustache templates to the templates folder in the working
         directory

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha/infra/__init__.py

@@ -1,12 +1,17 @@
-from alpha.infra.connectors.ldap_connector import LDAPConnector
 from alpha.infra.databases.sql_alchemy import SqlAlchemyDatabase
 from alpha.infra.models.filter_operators import And, Or
 from alpha.infra.models.json_patch import JsonPatch
 from alpha.infra.models.order_by import OrderBy, Order
 from alpha.infra.models.search_filter import SearchFilter, Operator
 
+# Optional LDAP support - only import if ldap3 is available
+try:
+    from alpha.infra.connectors.ldap_connector import LDAPConnector  # noqa: F401
+    _LDAP_AVAILABLE = True
+except ImportError:
+    _LDAP_AVAILABLE = False # type: ignore
+
 __all__ = [
-    "LDAPConnector",
     "SqlAlchemyDatabase",
     "And",
     "Or",
@@ -16,3 +21,9 @@ __all__ = [
     "SearchFilter",
     "Operator",
 ]
+
+# Conditionally add LDAP-related exports if available
+if _LDAP_AVAILABLE:
+    __all__.extend([
+        "LDAPConnector",
+    ])

alpha_python-0.3.2/src/alpha/infra/connectors/__init__.py

@@ -0,0 +1,22 @@
+from alpha.infra.connectors.oidc_connector import (
+    OIDCConnector,
+    KeyCloakOIDCConnector,
+)
+
+# Optional LDAP support - only import if ldap3 is available
+try:
+    from alpha.infra.connectors.ldap_connector import LDAPConnector  # noqa: F401
+    _LDAP_AVAILABLE = True
+except ImportError:
+    _LDAP_AVAILABLE = False # type: ignore
+
+__all__ = [
+    "OIDCConnector",
+    "KeyCloakOIDCConnector",
+]
+
+# Conditionally add LDAP-related exports if available
+if _LDAP_AVAILABLE:
+    __all__.extend([
+        "LDAPConnector",
+    ])

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha/providers/__init__.py

@@ -9,9 +9,15 @@ from alpha.providers.models.credentials import PasswordCredentials
 from alpha.providers.models.token import Token
 
 # Providers
-from alpha.providers.ldap_provider import LDAPProvider, ADProvider
 from alpha.providers.oidc_provider import OIDCProvider, KeyCloakProvider
 
+# Optional LDAP support - only import if ldap3 is available
+try:
+    from alpha.providers.ldap_provider import LDAPProvider, ADProvider  # noqa: F401
+    _LDAP_AVAILABLE = True
+except ImportError:
+    _LDAP_AVAILABLE = False # type: ignore
+
 __all__ = [
     "Identity",
     "DEFAULT_LDAP_MAPPINGS",
@@ -19,8 +25,13 @@ __all__ = [
     "AD_SEARCH_ATTRIBUTES",
     "PasswordCredentials",
     "Token",
-    "LDAPProvider",
-    "ADProvider",
     "OIDCProvider",
     "KeyCloakProvider",
 ]
+
+# Conditionally add LDAP-related exports if available
+if _LDAP_AVAILABLE:
+    __all__.extend([
+        "LDAPProvider",
+        "ADProvider",
+    ])

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha/services/authentication_service.py

@@ -187,7 +187,8 @@ class AuthenticationService:
                 self.uow, self._repository_name
             )
             user = users.get_by_id(
-                value=identity.subject, attr=self._user_id_attribute
+                value=getattr(identity, self._user_id_attribute),
+                attr=self._user_id_attribute,
             )
             if user:
                 identity.update_from_user(user)

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.3.0
+Version: 0.3.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
@@ -16,7 +16,7 @@ Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: six>=1.17.0
 Requires-Dist: sqlalchemy>=2.0.44
 Requires-Dist: requests>=2.28.1
-Requires-Dist: dependency-injector<5.0.0,>=4.48.3
+Requires-Dist: dependency-injector[yaml]<5.0.0,>=4.48.3
 Provides-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"

{alpha_python-0.3.0 → alpha_python-0.3.2}/src/alpha_python.egg-info/requires.txt

@@ -8,7 +8,7 @@ pyjwt>=2.10.1
 six>=1.17.0
 sqlalchemy>=2.0.44
 requests>=2.28.1
-dependency-injector<5.0.0,>=4.48.3
+dependency-injector[yaml]<5.0.0,>=4.48.3
 
 [api-generator]
 jdk4py

alpha_python-0.3.0/src/alpha/infra/connectors/__init__.py

@@ -1,11 +0,0 @@
-from alpha.infra.connectors.ldap_connector import LDAPConnector
-from alpha.infra.connectors.oidc_connector import (
-    OIDCConnector,
-    KeyCloakOIDCConnector,
-)
-
-__all__ = [
-    "LDAPConnector",
-    "OIDCConnector",
-    "KeyCloakOIDCConnector",
-]