PyPI - labfreed - Versions diffs - 1.0.0a9__tar.gz → 1.0.0a10__tar.gz - Mend

labfreed 1.0.0a9tar.gz → 1.0.0a10tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

{labfreed-1.0.0a9 → labfreed-1.0.0a10}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 1.0.0a9
+Version: 1.0.0a10
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11

{labfreed-1.0.0a9 → labfreed-1.0.0a10}/labfreed/__init__.py RENAMED Viewed

@@ -2,7 +2,7 @@
 Python implementation of LabFREED building blocks
 '''
-__version__ = "1.0.0a9"
+__version__ = "1.0.0a10"
 from labfreed.pac_id import *  # noqa: F403
 from labfreed.pac_cat import * # noqa: F403

{labfreed-1.0.0a9 → labfreed-1.0.0a10}/labfreed/pac_attributes/api_data_models/request.py RENAMED Viewed

@@ -8,7 +8,7 @@ class AttributeRequestPayload(LabFREED_BaseModel):
     model_config = ConfigDict(frozen=True)
     pac_ids: list[str]
-    language_preferences: list[str]
+    language_preferences: list[str]|None = None
     restrict_to_attribute_groups: list[str]|None = None
     suppress_forward_lookup: bool = False

{labfreed-1.0.0a9 → labfreed-1.0.0a10}/labfreed/pac_attributes/client/client.py RENAMED Viewed

@@ -142,7 +142,7 @@ class AttributeClient():
             r = AttributeResponsePayload.model_validate_json(response_body_str)
         except ValidationError as e:
             print(e)
-            raise AttributeServerError("The server accepted the request, and sent a reponse. However, the response is adhering to the PAC Attributes specifications. Contact the server admin.")
+            raise AttributeServerError("The server accepted the request, and sent a reponse. However, the response is not adhering to the PAC Attributes specifications. Contact the server admin.")
         # update cache

{labfreed-1.0.0a9 → labfreed-1.0.0a10}/labfreed/pac_attributes/pythonic/attribute_server_factory.py RENAMED Viewed

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import Any, Protocol
-from flask import Blueprint, current_app
+from flask import Blueprint, current_app, url_for
 from labfreed.pac_attributes.api_data_models.request import AttributeRequestPayload
 from labfreed.pac_attributes.server.server import AttributeGroupDataSource, AttributeServerRequestHandler, InvalidRequestError, TranslationDataSource
@@ -87,7 +87,7 @@ class AttributeFlaskApp(Flask):
             except Exception as e:
                 print(e)
                 return "The request was valid, but the server encountered an error", 500
-            return response_body
+            return (response_body, 200, {"Content-Type": "application/json"})
         @bp.route("/", methods=["GET"], strict_slashes=False)
         def capabilities():
@@ -96,31 +96,38 @@ class AttributeFlaskApp(Flask):
             authentication_required = bool(current_app.config.get('AUTHENTICATOR'))
             example_request = AttributeRequestPayload(pac_ids=['HTTPS://PAC.METTORIUS.COM/EXAMPLE'], language_preferences=['fr', 'de']).model_dump_json(indent=2, exclude_none=True, exclude_unset=True)
             server_address = request.url.rstrip('/')
+            css_url = url_for("static", filename="style.css")
             response = f'''
-                <body>
-                This is a <h1>LabFREED attribute server </h1>
-                <h2>Capabilities</h2>
-                Available Attribute Groups: {', '.join([f'<a href="{ag}"> {ag} </a>' for ag in capabilities.available_attribute_groups])} <br>
-                Supported Languages: {', '.join([f'<b> {l} </b>' for l in capabilities.supported_languages])}  <br>
-                Default Language: <b>{capabilities.default_language}</b> <br>
-                <h2>How to use</h2>
-                Make a <b>POST</b> request to <a href="{server_address}">{server_address}</a> with the following body:
-                <pre>{example_request}</pre>
-                Consult <a href="https://github.com/ApiniLabs/PAC-Attributes"> the specification </a> for details. <br>
-                {'This server <b> requires authentication </b> ' if authentication_required else ''}
-                <br>
-                {"<h2>Further Information</h2>"if doc_text else ""}
-                {doc_text or ""}
-                </body>
-            '''
+                <html>
+                    <head>
+                        <link rel="stylesheet" type="text/css" href="{css_url}">
+                    </head>
+                    <body>
+                        This is a <h1>LabFREED attribute server </h1>
+                        <h2>Capabilities</h2>
+                        Available Attribute Groups: {', '.join([f'<a href="{ag}"> {ag} </a>' for ag in capabilities.available_attribute_groups])} <br>
+                        Supported Languages: {', '.join([f'<b> {l} </b>' for l in capabilities.supported_languages])}  <br>
+                        Default Language: <b>{capabilities.default_language}</b> <br>
+                        <h2>How to use</h2>
+                        Make a <b>POST</b> request to <a href="{server_address}">{server_address}</a> with the following body:
+                        <pre>{example_request}</pre>
+                        Consult <a href="https://github.com/ApiniLabs/PAC-Attributes"> the specification </a> for details. <br>
+                        {'This server <b> requires authentication </b> ' if authentication_required else ''}
+                        <br>
+                        {"<h2>Further Information</h2>"if doc_text else ""}
+                        {doc_text or ""}
+                    </body>
+                </html>
+    '''
             return response