dyff-schema 0.28.0__tar.gz → 0.30.0__tar.gz

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/.gitignore

@@ -6,6 +6,7 @@
 
 # editors
 .vscode/
+.idea/
 *.swp
 .bloop/
 .metals/

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/.gitlab-ci.yml

@@ -7,20 +7,20 @@ stages:
   - deploy
 
 include:
-  - project: buildgarden/pipelines/gitlab
-    ref: 0.2.2
+  - project: saferatday0/library/gitlab
+    ref: 0.7.0
     file:
       - gitlab-release.yml
-  - project: buildgarden/pipelines/detect-secrets
-    ref: 0.2.3
+  - project: saferatday0/library/detect-secrets
+    ref: 0.6.0
     file:
       - detect-secrets.yml
-  - project: buildgarden/pipelines/prettier
-    ref: 0.3.2
+  - project: saferatday0/library/prettier
+    ref: 0.6.0
     file:
       - prettier.yml
-  - project: buildgarden/pipelines/python
-    ref: 0.14.2
+  - project: saferatday0/library/python
+    ref: 0.20.0
     file:
       - python-autoflake.yml
       - python-black.yml
@@ -32,8 +32,8 @@ include:
       - python-pytest.yml
       - python-twine-upload.yml
       - python-docformatter.yml
-  - project: buildgarden/pipelines/skywalking-eyes
-    ref: 0.2.2
+  - project: saferatday0/library/skywalking-eyes
+    ref: 0.5.0
     file:
       - license-eye-header-check.yml
 

dyff_schema-0.30.0/.idea/dyff-schema.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2024 UL Research Institutes
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-merge-conflict
@@ -23,45 +23,42 @@ repos:
           # - "--remove-all-unused-imports"
 
   - repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 25.1.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: "5.13.2"
+    rev: "6.0.1"
     hooks:
       - id: isort
 
   - repo: https://github.com/PyCQA/docformatter
-    rev: v1.7.5
+    rev: v1.7.7
     hooks:
       - id: docformatter
         additional_dependencies: [tomli]
         args: ["--in-place", "--black", "--config", "./pyproject.toml"]
 
-  - repo: https://gitlab.com/buildgarden/pipelines/skywalking-eyes
-    rev: "0.2.0"
+  - repo: https://gitlab.com/saferatday0/library/skywalking-eyes
+    rev: "0.5.0"
     hooks:
       - id: license-eye-header-fix
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v4.0.0-alpha.8"
+  - repo: https://gitlab.com/saferatday0/library/prettier
+    rev: 0.6.0
     hooks:
       - id: prettier
-        exclude: "^\\.gitlab-ci\\.yml$"
-
-  - repo: https://gitlab.com/buildgarden/tools/badgie
-    rev: "0.12.0"
+  - repo: https://gitlab.com/saferatday0/badgie
+    rev: "0.14.0"
     hooks:
       - id: badgie
 
-  - repo: https://gitlab.com/buildgarden/tools/cici-tools
-    rev: "0.7.0"
+  - repo: https://gitlab.com/saferatday0/cici
+    rev: "0.9.3"
     hooks:
       - id: cici-update
 
-  - repo: https://github.com/Yelp/detect-secrets
-    rev: v1.4.0
+  - repo: https://gitlab.com/saferatday0/library/detect-secrets
+    rev: 0.6.0
     hooks:
       - id: detect-secrets
-        args: ["--baseline", ".secrets.baseline"]

{dyff_schema-0.28.0/dyff_schema.egg-info → dyff_schema-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dyff-schema
-Version: 0.28.0
+Version: 0.30.0
 Summary: Data models for the Dyff AI auditing platform.
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0
@@ -26,7 +26,7 @@ Requires-Dist: hypothesis-jsonschema
 Requires-Dist: jsonpath-ng
 Requires-Dist: numpy<2
 Requires-Dist: pyarrow
-Requires-Dist: pydantic<2
+Requires-Dist: pydantic<3.0.0,>=2.0.0
 Dynamic: license-file
 
 # dyff-schema
@@ -39,8 +39,9 @@ Dynamic: license-file
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![code style: black](https://img.shields.io/badge/code_style-black-000000.svg)](https://github.com/psf/black)
 [![imports: isort](https://img.shields.io/badge/imports-isort-1674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
+[![formatter: docformatter](https://img.shields.io/badge/formatter-docformatter-fedcba.svg)](https://github.com/PyCQA/docformatter)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
-[![cici-tools Enabled](https://img.shields.io/badge/%E2%9A%A1_cici--tools-enabled-c0ff33)](https://gitlab.com/buildgarden/tools/cici-tools)
+[![cici enabled](https://img.shields.io/badge/%E2%9A%A1_cici-enabled-c0ff33)](https://gitlab.com/saferatday0/cici)
 
 <!-- END BADGIE TIME -->
 

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/README.md

@@ -8,8 +8,9 @@
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![code style: black](https://img.shields.io/badge/code_style-black-000000.svg)](https://github.com/psf/black)
 [![imports: isort](https://img.shields.io/badge/imports-isort-1674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
+[![formatter: docformatter](https://img.shields.io/badge/formatter-docformatter-fedcba.svg)](https://github.com/PyCQA/docformatter)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
-[![cici-tools Enabled](https://img.shields.io/badge/%E2%9A%A1_cici--tools-enabled-c0ff33)](https://gitlab.com/buildgarden/tools/cici-tools)
+[![cici enabled](https://img.shields.io/badge/%E2%9A%A1_cici-enabled-c0ff33)](https://gitlab.com/saferatday0/cici)
 
 <!-- END BADGIE TIME -->
 

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/dyff/schema/__init__.py

@@ -55,8 +55,8 @@ def upcast(
     if not isinstance(obj, dict):
         # Preserve the unset status
         obj = obj.dict(exclude_unset=True)
-    fields = {k: v for k, v in obj.items() if k in t.__fields__}
-    return t.parse_obj(fields)
+    fields = {k: v for k, v in obj.items() if k in t.model_fields}
+    return t.model_validate(fields)
 
 
 __all__ = [

dyff_schema-0.30.0/dyff/schema/_version.py

@@ -0,0 +1,2 @@
+__version__ = version = "0.30.0"
+__version_tuple__ = version_tuple = (0, 30, 0)

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/dyff/schema/copydoc.py

@@ -24,7 +24,7 @@ def copydoc(fromfunc):
         else:
             sourcedoc = fromfunc.__doc__
 
-        if func.__doc__ == None:
+        if func.__doc__ is None:
             func.__doc__ = sourcedoc
         else:
             func.__doc__ = f"{sourcedoc}\n\n{func.__doc__}"

{dyff_schema-0.28.0 → dyff_schema-0.30.0}/dyff/schema/v0/r1/adapters.py

@@ -789,7 +789,7 @@ def known_adapters() -> dict[str, Type[Adapter]]:
 
 def create_adapter(adapter_spec: SchemaAdapter | dict) -> Adapter:
     if isinstance(adapter_spec, SchemaAdapter):
-        adapter_spec = adapter_spec.dict()
+        adapter_spec = adapter_spec.model_dump()
     kind = adapter_spec["kind"]
     if (adapter_t := known_adapters().get(kind)) is not None:
         adapter_config = adapter_spec.get("configuration")
@@ -1024,7 +1024,7 @@ def _test():
             SchemaAdapter(
                 kind="ExplodeCollections",
                 configuration={"collections": ["text"]},
-            ).dict()
+            ).model_dump()
         ]
     )