oapi-profile-builder 3.7.1__tar.gz → 3.7.4__tar.gz

{oapi_profile_builder-3.7.1/src/oapi_profile_builder.egg-info → oapi_profile_builder-3.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oapi-profile-builder
-Version: 3.7.1
+Version: 3.7.4
 Summary: Authoritative tooling for creating OGC API Service Profiles (EDR, Features)
 Author-email: Shane Mill <shane.mill@noaa.gov>
 License: Apache License

{oapi_profile_builder-3.7.1 → oapi_profile_builder-3.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "oapi-profile-builder"
-version = "3.7.1"
+version = "3.7.4"
 description = "Authoritative tooling for creating OGC API Service Profiles (EDR, Features)"
 readme = "README.md"
 license = { file = "LICENSE" }

{oapi_profile_builder-3.7.1 → oapi_profile_builder-3.7.4}/src/oapi_profile_builder/generate.py

@@ -150,12 +150,34 @@ def _landing_page_schema(profile: "ServiceProfile") -> dict:
             "href": {"type": "string"},
             "rel": {"type": "string", "enum": link_rels},
             "type": {"type": "string"},
-            "title": {"type": "string"}
+            "title": {"type": "string"},
+            "hreflang": {"type": "string"}
         }
     }
 
+    links_to_show = []
+    if profile.links:
+        for l in profile.links:
+            link_obj = {"href": l.href, "rel": l.rel}
+            if l.type: link_obj["type"] = l.type
+            if l.title: link_obj["title"] = l.title
+            if getattr(l, "hreflang", None): link_obj["hreflang"] = l.hreflang
+            links_to_show.append(link_obj)
+    else:
+        links_to_show = [
+            {"href": "/", "rel": "self", "type": "application/json", "title": "this document"},
+            {"href": "/api", "rel": "service-desc", "type": "application/vnd.oai.openapi+json;version=3.0.0", "title": "the API definition"},
+            {"href": "/conformance", "rel": "conformance", "type": "application/json", "title": "OGC API conformance classes implemented by this server"},
+            {"href": "/collections", "rel": "data", "type": "application/json", "title": "Information about the collections"},
+            {"href": profile_uri, "rel": "profile", "type": "text/html", "title": "The Service Profile for this API"}
+        ]
+
     schema_props: dict = {
-        "links": {"type": "array", "items": link_items},
+        "links": {
+            "type": "array",
+            "items": link_items,
+            "enum": [links_to_show]
+        },
         "title": {"type": "string", **_const(profile.title, version)},
         "version": {"type": "string", **_const(profile.version, version)},
         "x-ogc-profile": {"type": "string", **_const(profile_uri, version)}
@@ -164,7 +186,11 @@ def _landing_page_schema(profile: "ServiceProfile") -> dict:
     if profile.description:
         schema_props["description"] = {"type": "string", **_const(profile.description, version)}
     if profile.keywords:
-        schema_props["keywords"] = {"type": "array", "items": {"type": "string", "enum": profile.keywords}}
+        schema_props["keywords"] = {
+            "type": "array",
+            "items": {"type": "string"},
+            "enum": [profile.keywords]
+        }
     
     if profile.provider:
         p = profile.provider
@@ -567,7 +593,7 @@ def _parameter_schema(version: str) -> dict:
             },
             "extent": {"type": "object"},
         },
-        "additionalProperties": True,
+        "additionalProperties": False,
     }
 
 
@@ -576,6 +602,7 @@ def _parameter_instance_schema(param: object, version: str) -> dict:
     schema = {
         "type": "object",
         "required": ["type", "observedProperty"],
+        "additionalProperties": False,
         "properties": {
             "type": {"type": "string", **_const("Parameter", version)},
         }
@@ -647,7 +674,7 @@ def _collection_response_schema(coll: Collection,
     else:
         param_item_schema = _parameter_schema(profile.openapi_version)
 
-    param_names_schema: dict = {"type": "object", "additionalProperties": param_item_schema}
+    param_names_schema: dict = {"type": "object", "additionalProperties": False}
     if coll.parameter_names:
         param_names_schema["properties"] = {
             name: _parameter_instance_schema(param, version)
@@ -676,21 +703,48 @@ def _collection_response_schema(coll: Collection,
     if coll.extent and coll.extent.temporal:
         t = coll.extent.temporal
         temporal_props = {"trs": {"type": "string", **_const(t.trs, version)}}
-        if t.interval: temporal_props["interval"] = {"type": "array", **_const(t.interval, version)}
-        if t.values: temporal_props["values"] = {"type": "array", **_const(t.values, version)}
+        if t.interval:
+            temporal_props["interval"] = {
+                "type": "array",
+                "items": {"type": "array", "items": {"type": "string", "nullable": True}},
+                **_const(t.interval, version)
+            }
+        if t.values:
+            temporal_props["values"] = {
+                "type": "array",
+                "items": {"type": "string"},
+                **_const(t.values, version)
+            }
         extent_props["temporal"] = {"type": "object", "required": ["trs"], "properties": temporal_props}
     if coll.extent and coll.extent.vertical:
         v = coll.extent.vertical
         vertical_props = {"vrs": {"type": "string", **_const(v.vrs, version)}}
-        if v.interval: vertical_props["interval"] = {"type": "array", **_const(v.interval, version)}
-        if v.values: vertical_props["values"] = {"type": "array", **_const(v.values, version)}
+        if v.interval:
+            vertical_props["interval"] = {
+                "type": "array",
+                "items": {"type": "array", "items": {"type": "number"}},
+                **_const(v.interval, version)
+            }
+        if v.values:
+            vertical_props["values"] = {
+                "type": "array",
+                "items": {"type": "string"},
+                **_const(v.values, version)
+            }
         if getattr(v, "positive", None): vertical_props["positive"] = {"type": "string", **_const(v.positive, version)}
         extent_props["vertical"] = {"type": "object", "required": ["vrs"], "properties": vertical_props}
     if coll.extent and coll.extent.custom:
-        custom_items = [{"type": "object", "required": ["id", "interval", "reference"],
-                         "properties": {"id": {"type": "string", **_const(c.id, version)},
-                                        "interval": {"type": "array", **_const(c.interval, version)},
-                                        "reference": {"type": "string", **_const(c.reference, version)}}} for c in coll.extent.custom]
+        custom_items = []
+        for c in coll.extent.custom:
+            custom_items.append({
+                "type": "object",
+                "required": ["id", "interval", "reference"],
+                "properties": {
+                    "id": {"type": "string", **_const(c.id, version)},
+                    "interval": {"type": "array", "items": {"type": "string"}, **_const(c.interval, version)},
+                    "reference": {"type": "string", **_const(c.reference, version)},
+                }
+            })
         extent_props["custom"] = {"type": "array", "items": {"oneOf": custom_items}}
 
     dq_props = {}
@@ -714,17 +768,26 @@ def _collection_response_schema(coll: Collection,
                 "variables": {"type": "object", "properties": vars_props}
             }}}}
 
+    links_to_show = []
+    if coll.links:
+        for l in coll.links:
+            link_obj = {"href": l.href, "rel": l.rel}
+            if l.type: link_obj["type"] = l.type
+            if l.title: link_obj["title"] = l.title
+            if getattr(l, "hreflang", None): link_obj["hreflang"] = l.hreflang
+            links_to_show.append(link_obj)
+
     schema: dict = {
         "type": "object", "required": ["id", "links", "extent"],
         "properties": {
             "id": {"type": "string", **_const(coll.id, version)},
             "title": {"type": "string", **_const(coll.title, version)} if coll.title else {"type": "string"},
             "description": {"type": "string", **_const(coll.description, version)} if coll.description else {"type": "string"},
-            "keywords": {"type": "array", "items": {"type": "string", "enum": coll.keywords}} if coll.keywords else {"type": "array"},
-            "links": _LINKS_ARRAY, "crs": crs_array_schema, "output_formats": output_formats_schema,
-            "parameter_names": param_names_schema,
+            "keywords": {"type": "array", "items": {"type": "string"}, "enum": [coll.keywords] if coll.keywords else [[]]},
+            "links": {"type": "array", "items": _LINK_SCHEMA, "enum": [links_to_show]}, "crs": crs_array_schema, "output_formats": output_formats_schema,
+            "parameter_names": {**param_names_schema, "additionalProperties": False},
             "extent": {"type": "object", "required": ["spatial"], "properties": extent_props},
-            "data_queries": {"type": "object", "properties": dq_props}
+            "data_queries": {"type": "object", "properties": dq_props, "additionalProperties": False}
         }
     }
     return {"description": "Collection metadata", "content": {"application/json": {"schema": schema}}}
@@ -1056,14 +1119,15 @@ def _core_paths(profile: ServiceProfile) -> dict:
     # Conformance response with required conformance classes
     conformance_response = copy.deepcopy(_R200_CONFORMANCE)
     if profile.required_conformance_classes:
+        schema = conformance_response["content"]["application/json"]["schema"]
         if version == "3.1.0":
-            conformance_response["content"]["application/json"]["schema"]["properties"]["conformsTo"]["contains"] = {
-                "enum": profile.required_conformance_classes
-            }
+            schema["properties"]["conformsTo"]["contains"] = {"enum": profile.required_conformance_classes}
         else:
-            conformance_response["content"]["application/json"]["schema"]["properties"]["conformsTo"]["items"] = {
-                "type": "string",
-                "enum": profile.required_conformance_classes
+            # Force listing all expected classes in Swagger UI by using enum at the array level
+            schema["properties"]["conformsTo"] = {
+                "type": "array",
+                "items": {"type": "string"},
+                "enum": [profile.required_conformance_classes]
             }
     
     return {

{oapi_profile_builder-3.7.1 → oapi_profile_builder-3.7.4}/src/oapi_profile_builder/models.py

@@ -44,6 +44,7 @@ from enum import Enum
 from typing import Annotated, List, Literal, Optional
 
 from annotated_types import Len
+from edr_pydantic.link import Link
 from edr_pydantic.collections import Collection as EDRCollection
 from edr_pydantic.extent import Custom, Extent as EDRExtent, Spatial, Vertical
 from pydantic import AwareDatetime, BaseModel, Field, field_validator, model_validator
@@ -894,6 +895,7 @@ class ServiceProfile(BaseModel):
         default=None,
         description="Date the resource/service was published (ISO 8601 string). Surfaces as info.x-resource-publish-date.",
     )
+    links: list[Link] = Field(default_factory=list, description="Landing page links")
     resource_default_locale: str | None = Field(
         default=None,
         description="Default locale of the resource (e.g. 'eng'). Surfaces as info.x-default-locale.",

{oapi_profile_builder-3.7.1 → oapi_profile_builder-3.7.4/src/oapi_profile_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oapi-profile-builder
-Version: 3.7.1
+Version: 3.7.4
 Summary: Authoritative tooling for creating OGC API Service Profiles (EDR, Features)
 Author-email: Shane Mill <shane.mill@noaa.gov>
 License: Apache License