diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index 9592c5e..a933f58 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -4,7 +4,7 @@ This project includes code from the following third-party open source projects: -## Authlib (1.6.9) - BSD License +## Authlib (1.6.11) - BSD License The ultimate Python library in building OAuth and OpenID Connect servers and clients. @@ -360,7 +360,7 @@ SOFTWARE. ``` -## aignostics-foundry-core (0.12.0) - MIT License +## aignostics-foundry-core (0.12.1) - MIT License 🏭 Foundational infrastructure for Foundry components. @@ -6393,7 +6393,7 @@ Python logging made (stupidly) simple * URL: https://github.com/Delgan/loguru * Author(s): Delgan -## lxml (6.0.2) - BSD-3-Clause +## lxml (6.1.0) - BSD-3-Clause Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. @@ -7296,7 +7296,7 @@ SOFTWARE. ``` -## pip (26.0.1) - UNKNOWN +## pip (26.1) - UNKNOWN The PyPA recommended tool for installing Python packages. @@ -9966,30 +9966,219 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` -## python-multipart (0.0.22) - Apache Software License +## python-multipart (0.0.26) - Apache Software License A streaming multipart parser for Python * URL: https://github.com/Kludex/python-multipart -* Author(s): Andrew Dunham , Marcelo Trylesinski +* Author(s): Andrew Dunham +* Maintainer(s): Marcelo Trylesinski ### License Text ``` -Copyright 2012, Andrew Dunham -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - https://www.apache.org/licenses/LICENSE-2.0 + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. ``` diff --git a/src/aignostics_foundry_core/AGENTS.md b/src/aignostics_foundry_core/AGENTS.md index 3684112..33714c1 100644 --- a/src/aignostics_foundry_core/AGENTS.md +++ b/src/aignostics_foundry_core/AGENTS.md @@ -50,7 +50,7 @@ This file provides an overview of all modules in `aignostics_foundry_core`, thei Defaults to empty values for direct construction (e.g. in tests). - `FoundryContext(BaseModel)` — frozen; fields: `name`, `version`, `version_full`, `version_with_vcs_ref`, `environment`, `env_file: list[Path]`, `env_prefix`, `python_version` (Python runtime version string, - e.g. `"3.11.9"`), `metadata: PackageMetadata` (all package-derived fields: description, + e.g. `"3.11.9"`), `python_version_minor` (computed; major and minor only, e.g. `"3.11"`), `metadata: PackageMetadata` (all package-derived fields: description, author, URLs; populated by `from_package()` via `PackageMetadata.from_name()`; defaults to empty `PackageMetadata()`), plus four runtime mode bool flags: `is_container`, `is_cli`, `is_test`, `is_library` (all default `False`), and `database: DatabaseSettings | None` diff --git a/src/aignostics_foundry_core/foundry.py b/src/aignostics_foundry_core/foundry.py index 3923b0b..1ebfa92 100644 --- a/src/aignostics_foundry_core/foundry.py +++ b/src/aignostics_foundry_core/foundry.py @@ -28,7 +28,7 @@ from pathlib import Path from dotenv import dotenv_values -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, computed_field from aignostics_foundry_core.database import DatabaseSettings @@ -127,6 +127,21 @@ class FoundryContext(BaseModel): is_test: bool = False is_library: bool = False python_version: str = "" + + @computed_field + @property + def python_version_minor(self) -> str: + """Python runtime version limited to major and minor components (e.g. ``'3.11'``). + + Derived from :attr:`python_version`. Returns ``""`` when :attr:`python_version` + is not set (e.g. when the context is constructed directly in tests without + specifying a version). + """ + if not self.python_version: + return "" + major_minor_part_count = 2 + return ".".join(self.python_version.split(".")[:major_minor_part_count]) + project_path: Path | None = None metadata: PackageMetadata = Field(default_factory=PackageMetadata) """Package-derived author and description metadata. diff --git a/tests/aignostics_foundry_core/foundry_test.py b/tests/aignostics_foundry_core/foundry_test.py index 8828f1f..4ffa42f 100644 --- a/tests/aignostics_foundry_core/foundry_test.py +++ b/tests/aignostics_foundry_core/foundry_test.py @@ -120,6 +120,28 @@ def test_from_package_python_version_matches_platform() -> None: assert ctx.python_version == platform.python_version() +@pytest.mark.unit +def test_foundry_context_python_version_minor_from_full_version() -> None: + """python_version_minor returns major.minor when python_version is a full x.y.z string.""" + ctx = make_context(python_version="3.11.9") + assert ctx.python_version_minor == "3.11" + + +@pytest.mark.unit +def test_foundry_context_python_version_minor_empty_when_version_unset() -> None: + """python_version_minor returns '' when python_version is not set.""" + ctx = make_context() + assert not ctx.python_version_minor + + +@pytest.mark.unit +def test_foundry_context_python_version_minor_from_package() -> None: + """from_package() produces python_version_minor consistent with platform.python_version().""" + ctx = FoundryContext.from_package(PACKAGE_NAME) + expected = ".".join(platform.python_version().split(".")[:2]) + assert ctx.python_version_minor == expected + + @pytest.mark.unit def test_from_package_returns_correct_name() -> None: """from_package() sets .name to the package_name argument.""" diff --git a/tests/conftest.py b/tests/conftest.py index 232dd0a..60e838e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -85,6 +85,7 @@ def make_context( # noqa: PLR0913 database: DatabaseSettings | None = None, env_file: list[Path] | None = None, metadata: PackageMetadata | None = None, + python_version: str = "", **kwargs: bool, ) -> FoundryContext: """Create a minimal FoundryContext for testing. @@ -103,6 +104,8 @@ def make_context( # noqa: PLR0913 metadata: Optional :class:`~aignostics_foundry_core.foundry.PackageMetadata` to attach to the context. When ``None``, a ``PackageMetadata`` with ``repository_url`` set from the *repository_url* argument is used. + python_version: Python runtime version string (e.g. ``"3.11.9"``). Defaults to + ``""`` so contexts constructed in tests work without specifying a version. **kwargs: Optional boolean flags forwarded to :class:`FoundryContext` (``is_test``, ``is_cli``, ``is_container``, ``is_library``). """ @@ -118,5 +121,6 @@ def make_context( # noqa: PLR0913 database=database, env_file=env_file or [], metadata=resolved_metadata, + python_version=python_version, **kwargs, # type: ignore[arg-type] ) diff --git a/uv.lock b/uv.lock index 7fd67ae..53ba1a1 100644 --- a/uv.lock +++ b/uv.lock @@ -2029,11 +2029,11 @@ wheels = [ [[package]] name = "pip" -version = "26.0.1" +version = "26.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/48/83/0d7d4e9efe3344b8e2fe25d93be44f64b65364d3c8d7bc6dc90198d5422e/pip-26.0.1.tar.gz", hash = "sha256:c4037d8a277c89b320abe636d59f91e6d0922d08a05b60e85e53b296613346d8", size = 1812747, upload-time = "2026-02-05T02:20:18.702Z" } +sdist = { url = "https://files.pythonhosted.org/packages/73/7e/d2b04004e1068ad4fdfa2f227b839b5d03e602e47cdbbf49de71137c9546/pip-26.1.tar.gz", hash = "sha256:81e13ebcca3ffa8cc85e4deff5c27e1ee26dea0aa7fc2f294a073ac208806ff3", size = 1840316, upload-time = "2026-04-26T21:00:05.406Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/de/f0/c81e05b613866b76d2d1066490adf1a3dbc4ee9d9c839961c3fc8a6997af/pip-26.0.1-py3-none-any.whl", hash = "sha256:bdb1b08f4274833d62c1aa29e20907365a2ceb950410df15fc9521bad440122b", size = 1787723, upload-time = "2026-02-05T02:20:16.416Z" }, + { url = "https://files.pythonhosted.org/packages/70/7a/be4bd8bcbb24ea475856dd68159d78b03b2bb53dae369f69c9606b8888f5/pip-26.1-py3-none-any.whl", hash = "sha256:4e8486d821d814b77319acb7b9e8bf5a4ee7590a643e7cb21029f209be8573c1", size = 1812804, upload-time = "2026-04-26T21:00:03.194Z" }, ] [[package]]