amati 0.2__tar.gz → 0.2.2__tar.gz

{amati-0.2 → amati-0.2.2}/.github/dependabot.yml

@@ -1,6 +1,5 @@
 version: 2
 updates:
-  # Enable version updates for npm
   - package-ecosystem: "uv"
     # Look for `uv.lock` file in the root directory.
     directory: "/"
@@ -8,7 +7,6 @@ updates:
     schedule:
       interval: "daily"
 
-  # Enable version updates for GitHub Actions
   - package-ecosystem: "github-actions"
     # Workflow files stored in the default location of `.github/workflows`
     # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
@@ -18,3 +16,9 @@ updates:
     allow:
       - dependency-type: "direct"
       - dependency-type: "indirect"
+
+  - package-ecosystem: "docker"
+    # Look for `Dockerfile` in the root directory
+    directory: "/"
+    schedule:
+      interval: "weekly"

amati-0.2.2/.github/workflows/checks.yaml

@@ -0,0 +1,90 @@
+name: Checks
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dorny/paths-filter@v3
+        id: check_changes
+        with:
+          filters: |
+            relevant:
+              - '**/*.py'
+              - '**/*.sh'
+              - '**/*.json'
+              - '**/*.html'
+              - '**/*.toml'
+              - '**/*.lock'
+              - 'tests/**/*.yaml'
+              - '.pylintrc'
+              - '.python-version'
+              - '.Dockerfile'
+      
+      - name: Skip message
+        if: ${{ !(steps.check_changes.outputs.relevant == 'true') }}
+        run: echo "Skipping Python checks - no relevant changes detected"
+
+
+      - name: Install uv
+        if: steps.check_changes.outputs.relevant == 'true'
+        uses: astral-sh/setup-uv@v6
+
+      - name: Set up Python
+        if: steps.check_changes.outputs.relevant == 'true'
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: ".python-version"
+
+      - name: Install the project
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv sync --locked --all-extras --dev
+
+      - name: Formatting
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv run black .
+
+      - name: Import sorting
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv run isort .
+
+      - name: Linting
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv run pylint amati
+      
+      - name: Test Linting
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv run pylint tests
+
+      - name: Testing
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv run pytest -m"not external" --cov
+
+      - name: Doctests
+        if: steps.check_changes.outputs.relevant == 'true'
+        run: uv run pytest --doctest-modules amati/
+
+      - name: Coverage comment
+        if: steps.check_changes.outputs.relevant == 'true'
+        id: coverage_comment
+        uses: py-cov-action/python-coverage-comment-action@v3
+        with:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Store Pull Request comment to be posted
+        if: steps.check_changes.outputs.run_python_checks == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-coverage-comment-action
+          path: python-coverage-comment-action.txt

amati-0.2.2/.github/workflows/publish.yaml

@@ -0,0 +1,47 @@
+name: Publish to PyPI
+
+on:
+  release:
+    types: [published]
+
+
+jobs:
+  run:
+    name: "Build and publish release"
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # Required for OIDC authentication
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: ".python-version"
+      - name: Build
+        run: uv build
+      - name: Publish to PyPI test
+        run: uv publish --index testpypi
+      - name: Publish
+        run: uv publish
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags:  |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPO }}:${{ github.event.release.tag_name }}.1
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPO }}:alpha

amati-0.2.2/.python-version

@@ -0,0 +1 @@
+3.13.5

{amati-0.2 → amati-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amati
-Version: 0.2
+Version: 0.2.2
 Summary: Validates that a .yaml or .json file conforms to the OpenAPI Specifications 3.x.
 Project-URL: Homepage, https://github.com/ben-alexander/amati
 Project-URL: Issues, https://github.com/ben-alexander/amati/issues
@@ -28,7 +28,7 @@ amati is designed to validate that a file conforms to the [OpenAPI Specification
 
 ## Name
 
-amati means to observe in Malay, especially with attention to detail. It's also one of the plurals of beloved or favourite in Italian.
+"amati" means to observe in Malay, especially with attention to detail. It's also one of the plurals of beloved or favourite in Italian.
 
 ## Usage
 
@@ -59,34 +59,47 @@ A Dockerfile is available on [DockerHub](https://hub.docker.com/r/benale/amati/t
 To run against a specific specification the location of the specification needs to be mounted in the container.
 
 ```sh
-docker run -v "<path-to-mount>:/<mount-name> amati <options>
+docker run -v "<path-to-mount>:/<mount-name> amati:alpha <options>
 ```
 
 e.g. 
 
 ```sh
-docker run -v /Users/myuser/myrepo:/data amati --spec data/myspec.yaml --hr
+docker run -v /Users/myuser/myrepo:/data amati:alpha --spec data/myspec.yaml --hr
 ```
 
 ## Architecture
 
-This uses Pydantic, especially the validation, and Typing to construct the entire OAS as a single data type. Passing a dictionary to the top-level data type runs all the validation in the Pydantic models constructing a single set of inherited classes and datatypes that validate that the API specification is accurate.
+amati uses Pydantic, especially the validation, and Typing to construct the entire OAS as a single data type. Passing a dictionary to the top-level data type runs all the validation in the Pydantic models constructing a single set of inherited classes and datatypes that validate that the API specification is accurate. To the extent that Pydantic is functional, amati has a [functional core and an imperative shell](https://www.destroyallsoftware.com/screencasts/catalog/functional-core-imperative-shell).
 
 Where the specification conforms, but relies on implementation-defined behavior (e.g. [data type formats](https://spec.openapis.org/oas/v3.1.1.html#data-type-format)), a warning will be raised.
 
 ## Contributing
 
-### Requirements
+### Prerequisites
 
 * The latest version of [uv](https://docs.astral.sh/uv/)
 * [git 2.49+](https://git-scm.com/downloads/linux)
+* [Docker](https://docs.docker.com/engine/install/)
+
+### Starting
+
+The project uses a [`pyproject.toml` file](https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#writing-pyproject-toml) to determine what to build.
+
+To get started run:
+
+```sh
+uv python install
+uv venv
+uv sync
+```
 
 ### Testing and formatting
 
 This project uses:
 
 * [Pytest](https://docs.pytest.org/en/stable/) as a testing framework
-* [PyLance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) on strict mode for type checking
+* [Pyright](https://microsoft.github.io/pyright/#/) on strict mode for type checking
 * [Pylint](https://www.pylint.org/) as a linter, using a modified version from [Google's style guide](https://google.github.io/styleguide/pyguide.html)
 * [Hypothesis](https://hypothesis.readthedocs.io/en/latest/index.html) for test data generation
 * [Coverage](https://coverage.readthedocs.io/en/7.6.8/) on both the tests and code for test coverage
@@ -94,33 +107,20 @@ This project uses:
 * [isort](https://pycqa.github.io/isort/) for import sorting
 
 It's expected that there are no errors and 100% of the code is reached and executed. The strategy for test coverage is based on parsing test specifications and not unit tests.
-
-amati runs tests on external specifications, detailed in `tests/data/.amati.tests.yaml`. To be able to run these tests the appropriate GitHub repos need to be local. Specific revisions of the repos can be downloaded by running
+amati runs tests on the external specifications, detailed in `tests/data/.amati.tests.yaml`. To be able to run these tests the GitHub repos containing the specifications need to be available locally. Specific revisions of the repos can be downloaded by running the following, which will clone the repos into `../amati-tests-specs/<repo-name>`.
 
 ```sh
 python scripts/tests/setup_test_specs.py
 ```
 
+If there are some issues with the specification a JSON file detailing those should be placed into `tests/data/` and the name of that file noted in `tests/data/.amati.tests.yaml` for the test suite to pick it up and check that the errors are expected. Any specifications that close the coverage gap are gratefully received.
+
 To run everything, from linting, type checking to downloading test specs and building and testing the Docker image run:
 
 ```sh
 sh bin/checks.sh
 ```
 
-You will need to have Docker installed.
-
-### Building
-
-The project uses a [`pyproject.toml` file](https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#writing-pyproject-toml) to determine what to build.
-
-To install, assuming that [uv](https://docs.astral.sh/uv/) is already installed and initialised
-
-```sh
-uv python install
-uv venv
-uv sync
-```
-
 ### Docker
 
 A development Docker image is provided, `Dockerfile.dev`, to build:
@@ -129,7 +129,7 @@ A development Docker image is provided, `Dockerfile.dev`, to build:
 docker build -t amati -f Dockerfile .
 ```
 
-and to run against a specific specification the location of the specification needs to be mounted in the container.
+to run against a specific specification the location of the specification needs to be mounted in the container.
 
 ```sh
 docker run -v "<path-to-mount>:/<mount-name> amati <options>
@@ -138,13 +138,13 @@ docker run -v "<path-to-mount>:/<mount-name> amati <options>
 This can be tested against a provided specification, from the root directory
 
 ```sh
-docker run --detach -v "$(pwd):/data" amati
+docker run --detach -v "$(pwd):/data" amati <options>
 ```
 
 
 ### Data
 
-There are some scripts to create the data needed by the project, for example, all the possible licences. If the data needs to be refreshed this can be done by running the contents of `/scripts/data`.
+There are some scripts to create the data needed by the project, for example, all the registered TLDs. To refresh the data, run the contents of `/scripts/data`.
 
 
 

{amati-0.2 → amati-0.2.2}/README.md

@@ -4,7 +4,7 @@ amati is designed to validate that a file conforms to the [OpenAPI Specification
 
 ## Name
 
-amati means to observe in Malay, especially with attention to detail. It's also one of the plurals of beloved or favourite in Italian.
+"amati" means to observe in Malay, especially with attention to detail. It's also one of the plurals of beloved or favourite in Italian.
 
 ## Usage
 
@@ -35,34 +35,47 @@ A Dockerfile is available on [DockerHub](https://hub.docker.com/r/benale/amati/t
 To run against a specific specification the location of the specification needs to be mounted in the container.
 
 ```sh
-docker run -v "<path-to-mount>:/<mount-name> amati <options>
+docker run -v "<path-to-mount>:/<mount-name> amati:alpha <options>
 ```
 
 e.g. 
 
 ```sh
-docker run -v /Users/myuser/myrepo:/data amati --spec data/myspec.yaml --hr
+docker run -v /Users/myuser/myrepo:/data amati:alpha --spec data/myspec.yaml --hr
 ```
 
 ## Architecture
 
-This uses Pydantic, especially the validation, and Typing to construct the entire OAS as a single data type. Passing a dictionary to the top-level data type runs all the validation in the Pydantic models constructing a single set of inherited classes and datatypes that validate that the API specification is accurate.
+amati uses Pydantic, especially the validation, and Typing to construct the entire OAS as a single data type. Passing a dictionary to the top-level data type runs all the validation in the Pydantic models constructing a single set of inherited classes and datatypes that validate that the API specification is accurate. To the extent that Pydantic is functional, amati has a [functional core and an imperative shell](https://www.destroyallsoftware.com/screencasts/catalog/functional-core-imperative-shell).
 
 Where the specification conforms, but relies on implementation-defined behavior (e.g. [data type formats](https://spec.openapis.org/oas/v3.1.1.html#data-type-format)), a warning will be raised.
 
 ## Contributing
 
-### Requirements
+### Prerequisites
 
 * The latest version of [uv](https://docs.astral.sh/uv/)
 * [git 2.49+](https://git-scm.com/downloads/linux)
+* [Docker](https://docs.docker.com/engine/install/)
+
+### Starting
+
+The project uses a [`pyproject.toml` file](https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#writing-pyproject-toml) to determine what to build.
+
+To get started run:
+
+```sh
+uv python install
+uv venv
+uv sync
+```
 
 ### Testing and formatting
 
 This project uses:
 
 * [Pytest](https://docs.pytest.org/en/stable/) as a testing framework
-* [PyLance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) on strict mode for type checking
+* [Pyright](https://microsoft.github.io/pyright/#/) on strict mode for type checking
 * [Pylint](https://www.pylint.org/) as a linter, using a modified version from [Google's style guide](https://google.github.io/styleguide/pyguide.html)
 * [Hypothesis](https://hypothesis.readthedocs.io/en/latest/index.html) for test data generation
 * [Coverage](https://coverage.readthedocs.io/en/7.6.8/) on both the tests and code for test coverage
@@ -70,33 +83,20 @@ This project uses:
 * [isort](https://pycqa.github.io/isort/) for import sorting
 
 It's expected that there are no errors and 100% of the code is reached and executed. The strategy for test coverage is based on parsing test specifications and not unit tests.
-
-amati runs tests on external specifications, detailed in `tests/data/.amati.tests.yaml`. To be able to run these tests the appropriate GitHub repos need to be local. Specific revisions of the repos can be downloaded by running
+amati runs tests on the external specifications, detailed in `tests/data/.amati.tests.yaml`. To be able to run these tests the GitHub repos containing the specifications need to be available locally. Specific revisions of the repos can be downloaded by running the following, which will clone the repos into `../amati-tests-specs/<repo-name>`.
 
 ```sh
 python scripts/tests/setup_test_specs.py
 ```
 
+If there are some issues with the specification a JSON file detailing those should be placed into `tests/data/` and the name of that file noted in `tests/data/.amati.tests.yaml` for the test suite to pick it up and check that the errors are expected. Any specifications that close the coverage gap are gratefully received.
+
 To run everything, from linting, type checking to downloading test specs and building and testing the Docker image run:
 
 ```sh
 sh bin/checks.sh
 ```
 
-You will need to have Docker installed.
-
-### Building
-
-The project uses a [`pyproject.toml` file](https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#writing-pyproject-toml) to determine what to build.
-
-To install, assuming that [uv](https://docs.astral.sh/uv/) is already installed and initialised
-
-```sh
-uv python install
-uv venv
-uv sync
-```
-
 ### Docker
 
 A development Docker image is provided, `Dockerfile.dev`, to build:
@@ -105,7 +105,7 @@ A development Docker image is provided, `Dockerfile.dev`, to build:
 docker build -t amati -f Dockerfile .
 ```
 
-and to run against a specific specification the location of the specification needs to be mounted in the container.
+to run against a specific specification the location of the specification needs to be mounted in the container.
 
 ```sh
 docker run -v "<path-to-mount>:/<mount-name> amati <options>
@@ -114,13 +114,13 @@ docker run -v "<path-to-mount>:/<mount-name> amati <options>
 This can be tested against a provided specification, from the root directory
 
 ```sh
-docker run --detach -v "$(pwd):/data" amati
+docker run --detach -v "$(pwd):/data" amati <options>
 ```
 
 
 ### Data
 
-There are some scripts to create the data needed by the project, for example, all the possible licences. If the data needs to be refreshed this can be done by running the contents of `/scripts/data`.
+There are some scripts to create the data needed by the project, for example, all the registered TLDs. To refresh the data, run the contents of `/scripts/data`.
 
 
 

{amati-0.2 → amati-0.2.2}/amati/amati.py

@@ -16,7 +16,7 @@ sys.path.insert(0, str(Path(__file__).parent.parent))
 from amati._error_handler import handle_errors
 from amati._resolve_forward_references import resolve_forward_references
 from amati.file_handler import load_file
-from amati.logging import Log, LogMixin
+from amati.logging import Log, Logger
 
 type JSONPrimitive = str | int | float | bool | None
 type JSONArray = list["JSONValue"]
@@ -113,9 +113,9 @@ def run(
 
     logs: list[Log] = []
 
-    with LogMixin.context():
+    with Logger.context():
         result, errors = dispatch(data)
-        logs.extend(LogMixin.logs)
+        logs.extend(Logger.logs)
 
     if errors or logs:
 
@@ -158,19 +158,38 @@ def run(
     if result and consistency_check:
         return check(data, result)
 
+    return True
 
-def discover(discover_dir: str = ".") -> list[Path]:
+
+def discover(spec: str, discover_dir: str = ".") -> list[Path]:
     """
     Finds OpenAPI Specification files to validate
 
     Args:
+        spec: The path to a specific OpenAPI specification file.
         discover_dir: The directory to search through.
     Returns:
-        A list of paths to validate.
+        A list of specifications to validate.
     """
 
     specs: list[Path] = []
 
+    # If a spec is provided, check if it exists and erorr if not
+    if spec:
+        spec_path = Path(spec)
+
+        if not spec_path.exists():
+            raise FileNotFoundError(f"File {spec} does not exist.")
+
+        if not spec_path.is_file():
+            raise IsADirectoryError(f"{spec} is a directory, not a file.")
+
+        specs.append(spec_path)
+
+        # End early if we're not also trying to find files
+        if not discover_dir:
+            return specs
+
     if Path("openapi.json").exists():
         specs.append(Path("openapi.json"))
 
@@ -258,16 +277,20 @@ if __name__ == "__main__":
     )
 
     args = parser.parse_args()
+    
+    print('Starting amati...')
 
-    if args.spec:
-        specifications: list[Path] = [Path(args.spec)]
-    else:
-        specifications = discover(args.discover)
+    specifications = discover(args.spec, args.discover)
+    print(specifications)
 
     for specification in specifications:
-        if successful_check := run(
+        successful_check = run(
             specification, args.consistency_check, args.local, args.html_report
-        ):
-            print("Consistency check successful for {specification}")
-        else:
-            print("Consistency check failed for {specification}")
+        )
+
+        if args.consistency_check and successful_check:
+            print(f"Consistency check successful for {specification}")
+        elif args.consistency_check:
+            print(f"Consistency check failed for {specification}")
+            
+    print('completed.')

{amati-0.2 → amati-0.2.2}/amati/logging.py

@@ -18,7 +18,7 @@ class Log(TypedDict):
     url: NotRequired[str]
 
 
-class LogMixin:
+class Logger:
     """
     A mixin class that provides logging functionality.