[feature] Add credentials v2.1.1 and corresponding modules.

py_ocpi/core/dependencies.py

@@ -36,7 +36,7 @@ def get_endpoints():
 
 def pagination_filters(
     date_from: datetime = Query(default=None),
-    date_to: datetime = Query(default=datetime.now()),
+    date_to: datetime = Query(default=None),
     offset: int = Query(default=0),
     limit: int = Query(default=50),
 ):

py_ocpi/core/push.py

@@ -10,7 +10,7 @@
 from py_ocpi.core.dependencies import get_crud, get_adapter
 from py_ocpi.core.enums import ModuleID, RoleEnum
 from py_ocpi.core.config import settings
-from py_ocpi.modules.versions.enums import InterfaceRole, VersionNumber
+from py_ocpi.modules.versions.v_2_2_1.enums import InterfaceRole, VersionNumber
 
 
 def client_url(module_id: ModuleID, object_id: str, base_url: str) -> str:

py_ocpi/core/utils.py

@@ -28,6 +28,15 @@ def get_auth_token(request: Request) -> Union[str, None]:
     return decode_string_base64(token)
 
 
+def get_auth_token_from_header(request: Request) -> str | None:
+    headers = request.headers
+    headers_token = headers.get("authorization", "Token Null")
+    token = headers_token.split()[1]
+    if token == "Null":
+        return None
+    return token
+
+
 async def get_list(
     response: Response,
     filters: dict,

py_ocpi/main.py

@@ -10,7 +10,7 @@
 )
 from py_ocpi.core.endpoints import ENDPOINTS
 
-from py_ocpi.modules.versions.api import (
+from py_ocpi.modules.versions import (
     router as versions_router,
     versions_v_2_2_1_router,
 )

py_ocpi/modules/versions/__init__.py

@@ -0,0 +1,3 @@
+from .main import router
+from .v_2_2_1.api import router as versions_v_2_2_1_router
+from .v_2_1_1.api import router as versions_v_2_1_1_router

py_ocpi/modules/versions/enums.py

@@ -12,18 +12,3 @@ class VersionNumber(str, Enum):
     v_2_2 = "2.2"
     v_2_2_1 = "2.2.1"
     latest = "2.2.1"
-
-
-class InterfaceRole(str, Enum):
-    """
-    https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc#123-interfacerole-enum
-    """
-
-    # Sender Interface implementation.
-    # Interface implemented by the owner of data,
-    # so the Receiver can Pull information from the data Sender/owner.
-    sender = "SENDER"
-    # Receiver Interface implementation.
-    # Interface implemented by the receiver of data,
-    # so the Sender/owner can Push information to the Receiver.
-    receiver = "RECEIVER"

py_ocpi/modules/versions/schemas.py

@@ -1,10 +1,7 @@
-from typing import List
-
 from pydantic import BaseModel
 
-from py_ocpi.modules.versions.enums import VersionNumber, InterfaceRole
+from py_ocpi.modules.versions.enums import VersionNumber
 from py_ocpi.core.data_types import URL
-from py_ocpi.core.enums import ModuleID
 
 
 class Version(BaseModel):
@@ -14,22 +11,3 @@ class Version(BaseModel):
 
     version: VersionNumber
     url: URL
-
-
-class Endpoint(BaseModel):
-    """
-    https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc#122-endpoint-class
-    """
-
-    identifier: ModuleID
-    role: InterfaceRole
-    url: URL
-
-
-class VersionDetail(BaseModel):
-    """
-    https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc#121-data
-    """
-
-    version: VersionNumber
-    endpoints: List[Endpoint]

py_ocpi/modules/versions/v_2_1_1/api/__init__.py

@@ -0,0 +1 @@
+from .main import router

py_ocpi/modules/versions/v_2_1_1/api/main.py

@@ -0,0 +1,47 @@
+from fastapi import (
+    APIRouter,
+    Depends,
+    Request,
+    HTTPException,
+    status as fastapistatus,
+)
+
+from py_ocpi.core.crud import Crud
+from py_ocpi.core import status
+from py_ocpi.core.schemas import OCPIResponse
+from py_ocpi.core.dependencies import get_endpoints, get_crud
+from py_ocpi.core.utils import get_auth_token_from_header
+from py_ocpi.core.enums import Action, ModuleID
+
+from py_ocpi.modules.versions.v_2_1_1.schemas import (
+    VersionDetail,
+    VersionNumber,
+)
+
+router = APIRouter()
+
+
+@router.get("/2.1.1/details", response_model=OCPIResponse)
+async def get_version_details(
+    request: Request,
+    endpoints=Depends(get_endpoints),
+    crud: Crud = Depends(get_crud),
+):
+    auth_token = get_auth_token_from_header(request)
+
+    server_cred = await crud.do(
+        ModuleID.credentials_and_registration,
+        None,
+        Action.get_client_token,
+        auth_token=auth_token,
+    )
+    if server_cred is None:
+        raise HTTPException(fastapistatus.HTTP_401_UNAUTHORIZED, "Unauthorized")
+
+    return OCPIResponse(
+        data=VersionDetail(
+            version=VersionNumber.v_2_1_1,
+            endpoints=endpoints[VersionNumber.v_2_1_1],
+        ).dict(),
+        **status.OCPI_1000_GENERIC_SUCESS_CODE,
+    )

py_ocpi/modules/versions/v_2_1_1/enums.py

@@ -0,0 +1 @@
+from py_ocpi.modules.versions.enums import *  # noqa

py_ocpi/modules/versions/v_2_1_1/schemas.py

@@ -0,0 +1,25 @@
+from typing import List
+
+from pydantic import BaseModel
+
+from py_ocpi.modules.versions.v_2_1_1.enums import VersionNumber
+from py_ocpi.core.data_types import URL
+from py_ocpi.core.enums import ModuleID
+
+
+class Endpoint(BaseModel):
+    """
+    https://github.com/ocpi/ocpi/blob/release-2.1.1-bugfixes/version_information_endpoint.md#endpoint-class
+    """
+
+    identifier: ModuleID
+    url: URL
+
+
+class VersionDetail(BaseModel):
+    """
+    https://github.com/ocpi/ocpi/blob/release-2.1.1-bugfixes/version_information_endpoint.md#data-1
+    """
+
+    version: VersionNumber
+    endpoints: List[Endpoint]

py_ocpi/modules/versions/v_2_2_1/api/__init__.py

@@ -0,0 +1 @@
+from .main import router

py_ocpi/modules/versions/api/v_2_2_1.py → py_ocpi/modules/versions/v_2_2_1/api/main.py

@@ -6,15 +6,18 @@
     status as fastapistatus,
 )
 
-from py_ocpi.modules.versions.schemas import VersionDetail
-from py_ocpi.modules.versions.enums import VersionNumber
 from py_ocpi.core.crud import Crud
 from py_ocpi.core import status
 from py_ocpi.core.schemas import OCPIResponse
 from py_ocpi.core.dependencies import get_endpoints, get_crud
 from py_ocpi.core.utils import get_auth_token
 from py_ocpi.core.enums import Action, ModuleID
 
+from py_ocpi.modules.versions.v_2_2_1.schemas import (
+    VersionDetail,
+    VersionNumber,
+)
+
 router = APIRouter()
 
 

py_ocpi/modules/versions/v_2_2_1/enums.py

@@ -0,0 +1,16 @@
+from py_ocpi.modules.versions.enums import *  # noqa
+
+
+class InterfaceRole(str, Enum):  # noqa
+    """
+    https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc#123-interfacerole-enum
+    """
+
+    # Sender Interface implementation.
+    # Interface implemented by the owner of data,
+    # so the Receiver can Pull information from the data Sender/owner.
+    sender = "SENDER"
+    # Receiver Interface implementation.
+    # Interface implemented by the receiver of data,
+    # so the Sender/owner can Push information to the Receiver.
+    receiver = "RECEIVER"

py_ocpi/modules/versions/v_2_2_1/schemas.py

@@ -0,0 +1,26 @@
+from typing import List
+
+from pydantic import BaseModel
+
+from py_ocpi.modules.versions.v_2_2_1.enums import InterfaceRole, VersionNumber
+from py_ocpi.core.data_types import URL
+from py_ocpi.core.enums import ModuleID
+
+
+class Endpoint(BaseModel):
+    """
+    https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc#122-endpoint-class
+    """
+
+    identifier: ModuleID
+    role: InterfaceRole
+    url: URL
+
+
+class VersionDetail(BaseModel):
+    """
+    https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc#121-data
+    """
+
+    version: VersionNumber
+    endpoints: List[Endpoint]