amati 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

amati/_data/files/media-types.json

@@ -6,6 +6,8 @@
     "3gppHal+json",
     "3gppHalForms+json",
     "3gpp-ims+xml",
+    "3gpp-mbs-object-manifest+json",
+    "3gpp-mbs-user-service-descriptions+json",
     "A2L",
     "ace-groupcomm+cbor",
     "ace-trl+cbor",

amati/_data/files/schemes.json

@@ -151,6 +151,7 @@
   "ldaps": "Provisional",
   "leaptofrogans": "Permanent",
   "lid": "Provisional",
+  "linkid": "Provisional",
   "lorawan": "Provisional",
   "lpa": "Provisional",
   "lvlt": "Provisional",
@@ -384,6 +385,7 @@
   "wss": "Permanent",
   "wtai": "Provisional",
   "wyciwyg": "Provisional",
+  "xcompute": "Provisional",
   "xcon": "Permanent",
   "xcon-userid": "Permanent",
   "xfire": "Provisional",

amati/_data/media_types.py

@@ -8,7 +8,7 @@ DATA_FILE = Path("media-types.json")
 DATA_SOURCE: dict[str, str] = {
     "application": "https://www.iana.org/assignments/media-types/application.csv",
     "audio": "https://www.iana.org/assignments/media-types/audio.csv",
-    # "example": "currently no valid values",
+    # "example": "currently no valid values", # noqa ERA001
     "font": "https://www.iana.org/assignments/media-types/font.csv",
     "haptics": "https://www.iana.org/assignments/media-types/haptics.csv",
     "image": "https://www.iana.org/assignments/media-types/image.csv",

amati/_data/refresh.py

@@ -157,7 +157,9 @@ def get(data_type: data_types) -> dict[str, JSONValue] | list[JSONValue] | None:
     for module_ in to_get:
         module = importlib.import_module(f"amati._data.{module_}")
 
-        with open(current_path / module.DATA_FILE, encoding="utf-8") as f:
+        data_file: Path = current_path / module.DATA_FILE
+
+        with data_file.open(encoding="utf-8") as f:
             data = json.loads(f.read())
 
         if not data:

amati/amati.py

@@ -132,11 +132,11 @@ def run(
             if not error_path.exists():
                 error_path.mkdir()
 
-        with open(
-            error_path / error_file.with_suffix(error_file.suffix + ".json"),
-            "w",
-            encoding="utf-8",
-        ) as f:
+        json_error_file: Path = error_path / error_file.with_suffix(
+            error_file.suffix + ".json"
+        )
+
+        with json_error_file.open("w", encoding="utf-8") as f:
             f.write(json.dumps(handled_errors))
 
         if html_report:
@@ -150,11 +150,11 @@ def run(
             html_output = template.render(errors=handled_errors)
 
             # Save the output to a file
-            with open(
-                error_path / error_file.with_suffix(error_file.suffix + ".html"),
-                "w",
-                encoding="utf-8",
-            ) as f:
+
+            html_error_file: Path = error_path / error_file.with_suffix(
+                error_file.suffix + ".html"
+            )
+            with html_error_file.open("w", encoding="utf-8") as f:
                 f.write(html_output)
 
     if result and consistency_check:
@@ -247,7 +247,7 @@ if __name__ == "__main__":
             logger.info("Data refreshed successfully.")
             sys.exit(0)
         except Exception as e:
-            logger.error(f"Error refreshing data: {str(e)}")
+            logger.error(f"Error refreshing data: {e}")
             sys.exit(1)
 
     specification: Path = Path(args.spec)
@@ -262,7 +262,7 @@ if __name__ == "__main__":
         )
         logger.info(f"Specification {specification} processed successfully.")
     except Exception as e:
-        logger.error(f"Error processing {specification}, {str(e)}")
+        logger.error(f"Error processing {specification}, {e}")
         sys.exit(1)
 
     if args.consistency_check and successful_check:

amati/fields/uri.py

@@ -3,7 +3,7 @@ Validates a URI according to the RFC3986 ABNF grammar
 """
 
 from enum import Enum
-from typing import Self, cast
+from typing import ClassVar, Self, cast
 
 import idna
 from abnf import Node, ParseError, Rule
@@ -61,7 +61,7 @@ class Scheme(_Str):
 
         # Look up the scheme in the IANA registry to get status info
         # Returns None if the scheme is not in the registry
-        self.status = SCHEMES.get(value, None)
+        self.status = SCHEMES.get(value)
 
 
 class URIType(str, Enum):
@@ -123,7 +123,7 @@ class URI(_Str):
     # RFC 3987 Internationalized Resource Identifier (IRI) flag
     is_iri: bool = False
 
-    _attribute_map: dict[str, str] = {
+    _attribute_map: ClassVar[dict[str, str]] = {
         "authority": "authority",
         "iauthority": "authority",
         "host": "host",
@@ -176,7 +176,7 @@ class URI(_Str):
         # an additional return there is a code path in type() that doesn't return a
         # value. It's better to deal with the potential error case than ignore the
         # lack of a return value.
-        raise TypeError(f"{str(self)} does not have a URI type.")  # pragma: no cover
+        raise TypeError(f"{self!s} does not have a URI type.")  # pragma: no cover
 
     def __init__(self, value: str):
         """

amati/file_handler.py

@@ -151,7 +151,7 @@ class FileProcessor:
             True if the file is gzip-compressed, False otherwise.
         """
         try:
-            with open(file_path, "rb") as f:
+            with file_path.open("rb") as f:
                 magic = f.read(2)
                 return magic == b"\x1f\x8b"
         except OSError:
@@ -189,7 +189,7 @@ class FileProcessor:
             with gzip.open(file_path, "rt", encoding="utf-8") as f:
                 return f.read()
         else:
-            with open(file_path, encoding="utf-8") as f:
+            with file_path.open(encoding="utf-8") as f:
                 return f.read()
 
     def _get_appropriate_loader(self, file_path: Path) -> FileLoader:

amati/grammars/oas.py

@@ -36,10 +36,10 @@ class Rule(_Rule):
         # reference-token = *( unescaped / escaped )
         # unescaped       = %x00-2E / %x30-7D / %x7F-10FFFF
         #               ; %x2F ('/') and %x7E ('~') are excluded from 'unescaped'
-        # escaped         = "~" ( "0" / "1" )
+        # escaped         = "~" ( "0" / "1" ) # noqa: ERA001
         #               ; representing '~' and '/', respectively
         "name = *( CHAR )",
-        # token = 1*tchar,
-        # tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "."
+        # token = 1*tchar, # noqa: ERA001
+        # tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." # noqa: ERA001 E501
         #     / "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
     ]

amati/model_validators.py

@@ -154,7 +154,7 @@ def at_least_one_of(
             if is_truthy_with_numeric_zero(value):
                 return self
 
-        public_fields = ", ".join(f"{name}" for name in candidates.keys())
+        public_fields = ", ".join(f"{name}" for name in candidates)
 
         msg = f"{public_fields} do not have values, expected at least one."
         Logger.log(
@@ -245,10 +245,8 @@ def only_one_of(
                 truthy.append(name)
 
         if len(truthy) != 1:
-            if truthy:
-                field_string = ", ".join(truthy)
-            else:
-                field_string = "none"
+            field_string = ", ".join(truthy) if truthy else "none"
+
             msg = f"Expected at most one field to have a value, {field_string} did"
 
             Logger.log(

amati/validators/generic.py

@@ -52,10 +52,7 @@ class GenericObject(BaseModel):
         # If extra fields aren't allowed log those that aren't going to be added
         # to the model.
         for field in data:
-            if (
-                field not in self.model_dump().keys()
-                and field not in self.get_field_aliases()
-            ):
+            if field not in self.model_dump() and field not in self.get_field_aliases():
                 message = f"{field} is not a valid field for {self.__repr_name__()}."
                 Logger.log(
                     {
@@ -92,9 +89,7 @@ class GenericObject(BaseModel):
         excess_fields: set[str] = set()
 
         pattern: re.Pattern[str] = re.compile(self._extra_field_pattern)
-        excess_fields.update(
-            key for key in self.model_extra.keys() if not pattern.match(key)
-        )
+        excess_fields.update(key for key in self.model_extra if not pattern.match(key))
 
         for field in excess_fields:
             message = f"{field} is not a valid field for {self.__repr_name__()}."

amati/validators/oas304.py

@@ -239,7 +239,7 @@ class PathsObject(GenericObject):
         Special-case specification extensions, which are also allowed.
         """
 
-        for field in data.keys():
+        for field in data:
             # Specification extensions
             if field.startswith("x-"):
                 continue
@@ -700,7 +700,7 @@ class SchemaObject(GenericObject):
             if isinstance(type_val, str) and type_val != "null":
                 schema_dict["type"] = [type_val, "null"]
             elif isinstance(type_val, list) and "null" not in type_val:
-                schema_dict["type"] = type_val + ["null"]
+                schema_dict["type"] = [*type_val, ["null"]]
 
         # 2. Validate the schema structure using jsonschema's meta-schema
         # Get the right validator based on the declared $schema or default
@@ -748,7 +748,7 @@ class OAuthFlowObject(GenericObject):
     authorizationUrl: URI | None = None
     tokenUrl: URI | None = None
     refreshUrl: URI | None = None
-    scopes: dict[str, str] = {}
+    scopes: dict[str, str] = Field(default={})
     _reference_uri: ClassVar[str] = (
         "https://spec.openapis.org/oas/v3.0.4.html#oauth-flow-object"
     )
@@ -956,7 +956,7 @@ class ComponentsObject(GenericObject):
                     f"Invalid type for '{field_name}': expected dict, got {type(value)}"
                 )
 
-            for key in value.keys():
+            for key in value:
                 if not re.match(pattern, key):
                     raise ValueError(
                         f"Invalid key '{key}' in '{field_name}': must match pattern {pattern}"  # noqa: E501

amati/validators/oas311.py

@@ -104,7 +104,7 @@ class LicenceObject(GenericObject):
             except AmatiValueError:
                 Logger.log(
                     {
-                        "msg": f"{str(self.url)} is not a valid SPDX URL",
+                        "msg": f"{self.url} is not a valid SPDX URL",
                         "type": "warning",
                         "loc": (self.__class__.__name__,),
                         "input": self.url,
@@ -376,7 +376,7 @@ class SchemaObject(GenericObject):
             if isinstance(type_val, str) and type_val != "null":
                 schema_dict["type"] = [type_val, "null"]
             elif isinstance(type_val, list) and "null" not in type_val:
-                schema_dict["type"] = type_val + ["null"]
+                schema_dict["type"] = [*type_val, ["null"]]
 
         # 2. Validate the schema structure using jsonschema's meta-schema
         # Get the right validator based on the declared $schema or default
@@ -484,7 +484,7 @@ class ComponentsObject(GenericObject):
                     f"Invalid type for '{field_name}': expected dict, got {type(value)}"
                 )
 
-            for key in value.keys():
+            for key in value:
                 if not re.match(pattern, key):
                     raise ValueError(
                         f"Invalid key '{key}' in '{field_name}': must match pattern {pattern}"  # noqa: E501

{amati-0.3.2.dist-info → amati-0.3.4.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: amati
-Version: 0.3.2
+Version: 0.3.4
 Summary: Validates that a .yaml or .json file conforms to the OpenAPI Specifications 3.x.
 Project-URL: Homepage, https://github.com/gwyli/amati
 Project-URL: Issues, https://github.com/gwyli/amati/issues
 Author-email: Ben <2551337+ben-alexander@users.noreply.github.com>
 License-File: LICENSE
+Keywords: json,openapi,openapi3,openapi3.0,openapi3.1,swagger,validation,validator,yaml
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{amati-0.3.2.dist-info → amati-0.3.4.dist-info}/RECORD

@@ -2,22 +2,22 @@ amati/__init__.py,sha256=IXbWlVtFGTIdvxaafs8Qy8zeD3KjTDgK0omllFq8Jio,461
 amati/_error_handler.py,sha256=_zs0hWqNf6NlXPk9-2MWyk6t5QGttDxNqatZ5YnCm6U,1245
 amati/_logging.py,sha256=1q5mPlnZDSgAHl56lB20ZN6kV6OS-ew-8fvPeXF0uKI,1357
 amati/_resolve_forward_references.py,sha256=-9MORpUhgusGJdvnH502p8-dc9Q6zqaB5XkPZvp4o7E,6509
-amati/amati.py,sha256=_oFo_Z9cuS7NdN7WZTynXlTDMzndXuT4ERznGWaNpdw,8155
+amati/amati.py,sha256=tziCq9lSEwMB2ILqeJKh1d84bs4GtiVYl3J277fEnYg,8187
 amati/exceptions.py,sha256=MUzW7FsE0_4BJC99hStokMItKk7OvNBiqO6Zr6d_8cY,577
-amati/file_handler.py,sha256=59kAsyVHE8mddRrNgyEowgZLEsgLcsZsFq6GtH7ZYBo,8065
-amati/model_validators.py,sha256=py9QWEa68bE_tv9JrfnB2nJz16f4_Z2gLQAhH4O-CCs,14887
+amati/file_handler.py,sha256=21Vx6pLZIL3BHN2ZDcrF7rFTfOkbXSC-ZM8WXaNVo7Q,8063
+amati/model_validators.py,sha256=2Xxf9eNSe6873hoedctnLrsOqpDI65chAhyTIvA5Ui8,14820
 amati/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amati/_data/http_status_code.py,sha256=-BRAsm-EHOmvdKu0vHRWRPqYJu8pYUZ0bu9I4PyvYw4,867
 amati/_data/iso9110.py,sha256=4NXWgAJYUrHW4USScOomt5LrilJ4pERI1EZrPjcFneo,569
-amati/_data/media_types.py,sha256=N6yqhYijtRLLhuVSbFUGTFC7d-ewfQgatxCj0OlbS2c,1477
-amati/_data/refresh.py,sha256=bwc4aBD8n1Afn9c7aG6qeOpzTePqA8wls877x6Uj41E,4962
+amati/_data/media_types.py,sha256=eDSRU8iUmXQ1AHGSVVGfj2zeQ3-oA79bjgXeU5_PmME,1491
+amati/_data/refresh.py,sha256=4xoV0bJaNxlbYTgPO_N9SGqE5tR51esCB_edFWUBCNM,4998
 amati/_data/schemes.py,sha256=LLYqyw5iGG3xAGru11bKpQaKjm_DQl5fkT8t7rpwLh8,553
 amati/_data/spdx_licences.py,sha256=AxzLH4qt4QCODLXZ4G54L2L5AYR58iU7wViap0S2m90,628
 amati/_data/tlds.py,sha256=jDqcmmd9VKJZuk-PoLpU_xzjsKv5rFEKVQpJFiOVlR8,652
 amati/_data/files/http-status-codes.json,sha256=AueWBemPsc6zRs7cDpB8ilCHR5qnkw0DIJjHZIGiJqk,11938
 amati/_data/files/iso9110.json,sha256=UxJPL51KT_VT3S3TzdfFdgB4GxfE41CFehwBbWuYYlE,1946
-amati/_data/files/media-types.json,sha256=Sr8dslXet1K_94tP6lEjksK4B2BVoU1RJvdsiDOdYCg,56704
-amati/_data/files/schemes.json,sha256=MUXvZuXvPb2nGMZe6sdx_wz6ns5jUGgSBS794ttoVRA,11192
+amati/_data/files/media-types.json,sha256=ErLfyppEUgpgi7i3D96Iinkv4zbW6GWDkM-WKlhEUqg,56788
+amati/_data/files/schemes.json,sha256=60O41WFwzYzsE8dWGglHFkiYARrqamvj09jUQoeQy7I,11248
 amati/_data/files/spdx-licences.json,sha256=51c26uPzgWRAMh1_HF8kwmzjdCp5omnQedV5wTADNOU,285687
 amati/_data/files/tlds.json,sha256=reuo17MSM9QfShj_esErUEDXRhUA-RY8sOk4OewsXCs,22433
 amati/fields/__init__.py,sha256=dv5xKYZ-i9ARt9mg72vIjiu8DwgboqiWM4WL5AFxD8c,552
@@ -30,16 +30,16 @@ amati/fields/json.py,sha256=TsNMW5gcCc3tpjDd0Sew_8okzDQu6S_FLKjGGvoRVos,304
 amati/fields/media.py,sha256=P5CILzL_MZN5huo9SVN6JguIDT7cXVIYlID_tuNk0VY,3049
 amati/fields/oas.py,sha256=oRvruhRmY9VQtlqiPaRvGKeeOgjYE-JG5aUZYZay6Kg,1733
 amati/fields/spdx_licences.py,sha256=lkmF4pRVMPjFAt-j7-pwbivhY8Ydhgo25f5AhQaLlis,2648
-amati/fields/uri.py,sha256=h1wHIAoGI9rZtlekbL_EDALP-UI_nmE7o76AdN9gVvA,12353
-amati/grammars/oas.py,sha256=78G9wyOYnG0zxE880DTcAfckR9TN7aSL2GfaJYKcHqU,1628
+amati/fields/uri.py,sha256=NLKYUoW4Fl3TaaBuhMuaEjYhxT91atWMQoVSYf9a-1I,12364
+amati/grammars/oas.py,sha256=bZ84rwK-J1xaKjkeM8Z47VzhonhODGf-Cga1J6HdSUs,1678
 amati/grammars/rfc6901.py,sha256=vQPk-JROikiB6Qzujs9EDszYbpRggc5EA1vkkGNJ36U,642
 amati/grammars/rfc7159.py,sha256=ZYPGKh7zpcrZO7FA8pysUJ4jav2yq4WxFyi7r2GbjDY,2204
 amati/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amati/validators/generic.py,sha256=NM6ZkuGdM8SDvSUBbMcVz2KIYBWFH2lYTFMVpS1I5QM,5270
-amati/validators/oas304.py,sha256=suDonNEMIzOmX_JfJFT1kYTT0dFFcSHsk8qOpf_x80A,31967
-amati/validators/oas311.py,sha256=ey_j-6YR0rkYd6arVkeK1fDLsGBBoyWjjYBUy7Wj2xM,17325
-amati-0.3.2.dist-info/METADATA,sha256=6Nqw6_VOqBebMkCr1pGRePJkR5-i_Vl8gW0JoY1m9p4,6918
-amati-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amati-0.3.2.dist-info/entry_points.txt,sha256=sacBb6g0f0ZJtNjNYx93_Xe4y5xzawvklCFVXup9ru0,37
-amati-0.3.2.dist-info/licenses/LICENSE,sha256=WAA01ZXeNs1bwpNWKR6aVucjtYjYm_iQIUYkCAENjqM,1070
-amati-0.3.2.dist-info/RECORD,,
+amati/validators/generic.py,sha256=FawfxWyj3eXOCJuoycoN3o7G8PKrqje5zMwLbSmA6yk,5186
+amati/validators/oas304.py,sha256=oGDzwG7OS9P-aXHDCyxcEIoQDoCPQjBMg0jPKtZvqr0,31970
+amati/validators/oas311.py,sha256=NK-4P8Z4-HWxjt8PG0Vs9A9t4F2uPC3K4D8-sqJezIM,17315
+amati-0.3.4.dist-info/METADATA,sha256=0t5RdxmH7uaDYrIGl5on9tJDLta4hRPJ7yX_1jhWqYw,7006
+amati-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amati-0.3.4.dist-info/entry_points.txt,sha256=sacBb6g0f0ZJtNjNYx93_Xe4y5xzawvklCFVXup9ru0,37
+amati-0.3.4.dist-info/licenses/LICENSE,sha256=WAA01ZXeNs1bwpNWKR6aVucjtYjYm_iQIUYkCAENjqM,1070
+amati-0.3.4.dist-info/RECORD,,