asyncapi-python 0.1.2__tar.gz → 0.1.4__tar.gz

{asyncapi_python-0.1.2 → asyncapi_python-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: asyncapi-python
-Version: 0.1.2
+Version: 0.1.4
 Summary: Easily generate type-safe and async Python applications from AsyncAPI 3 specifications.
 License: Apache-2.0
 Author: Yaroslav Petrov
@@ -16,7 +16,7 @@ Provides-Extra: amqp
 Provides-Extra: codegen
 Requires-Dist: aio-pika ; extra == "amqp"
 Requires-Dist: black ; extra == "codegen"
-Requires-Dist: datamodel-code-generator[http] (>=0.26.1,<0.27.0) ; extra == "codegen"
+Requires-Dist: datamodel-code-generator[http] (>=0.26.4,<0.27.0) ; extra == "codegen"
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0) ; extra == "codegen"
 Requires-Dist: pydantic (>=2)
 Requires-Dist: pytz
@@ -25,6 +25,13 @@ Requires-Dist: typer[all] (>=0.12.5,<0.13.0) ; extra == "codegen"
 Description-Content-Type: text/markdown
 
 # AsyncAPI Python Code Generator
+> [!IMPORTANT]
+> Although commits to dev branch might seem infrequent, the project is under active development **as of December 2024**.
+>
+> We currently produce only those changes that are required to satisfy our personal use cases.
+> 
+> The number of commits will grow as we see increase in popularity of it, so do not hesitate
+> to star this repo, open issues, and pull requests.
 
 [Link to this github repository](https://github.com/G-USI/asyncapi-python)
 

{asyncapi_python-0.1.2 → asyncapi_python-0.1.4}/README.md

@@ -1,4 +1,11 @@
 # AsyncAPI Python Code Generator
+> [!IMPORTANT]
+> Although commits to dev branch might seem infrequent, the project is under active development **as of December 2024**.
+>
+> We currently produce only those changes that are required to satisfy our personal use cases.
+> 
+> The number of commits will grow as we see increase in popularity of it, so do not hesitate
+> to star this repo, open issues, and pull requests.
 
 [Link to this github repository](https://github.com/G-USI/asyncapi-python)
 

{asyncapi_python-0.1.2 → asyncapi_python-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "asyncapi-python"
-version = "0.1.2"
+version = "0.1.4"
 license = "Apache-2.0"
 description = "Easily generate type-safe and async Python applications from AsyncAPI 3 specifications."
 authors = ["Yaroslav Petrov <yaroslav.v.petrov@gmail.com>"]
@@ -32,7 +32,7 @@ jinja2 = { version = "^3.1.4", optional = true }
 typer = { extras = ["all"], version = "^0.12.5", optional = true }
 datamodel-code-generator = { extras = [
     "http",
-], version = "^0.26.1", optional = true }
+], version = "^0.26.4", optional = true }
 aio-pika = { version = "*", optional = true }
 pyyaml = { version = "*", optional = true }
 black = { version = "*", optional = true }

{asyncapi_python-0.1.2 → asyncapi_python-0.1.4}/src/asyncapi_python/amqp/consumer.py

@@ -68,7 +68,7 @@ class Consumer:
                 name=params.root.name,
                 callback=callback,
                 decode_message=lambda x: decode_message(
-                    x, union_model(input_types)
+                    x, union_model(tuple(input_types))
                 ).root,
             )
         else:
@@ -78,7 +78,7 @@ class Consumer:
                 reply_callback=self._reply_callback,
                 encode_message=encode_message,
                 decode_message=lambda x: decode_message(
-                    x, union_model(input_types)
+                    x, union_model(tuple(input_types))
                 ).root,
             )
         self._handlers[params] = handler

asyncapi_python-0.1.4/src/asyncapi_python_codegen/document/utils.py

@@ -0,0 +1,101 @@
+# Copyright 2024 Yaroslav Petrov <yaroslav.v.petrov@gmail.com>
+#
+# 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.
+
+from pathlib import Path
+from typing import Any, Union
+import yaml
+
+from .document_context import set_current_doc_path
+from .ref import Ref
+from collections import defaultdict
+
+
+Reference = Union[None, tuple[Path, tuple[str, ...]]]
+"""A reference type"""
+
+ReferenceCounter = defaultdict[Reference, set[Reference]]
+"""A reference counter"""
+
+
+def populate_jsonschema_defs(schema: Any) -> Any:
+    """Given a $defs element of the JsonSchema
+    1. Constructs back references map for all links
+    2. Populates types by copying its body into parent $def (if there is only one reference)
+    3. Adds a new $defs object (if there is more than one reference), and rewrites $refs
+    4. Returns a huge jsonschema $defs object containing all structs that have been referenced by the structs
+       from the original schema
+    """
+    counter: ReferenceCounter = defaultdict(lambda: set())
+    shared_schemas: dict[str, Any] = {}
+    _count_references(schema, None, counter)
+    res = _populate_jsonschema_recur(schema, counter, shared_schemas)
+    return {**res, **shared_schemas}
+
+
+def _count_references(schema: Any, this: Reference, counter: ReferenceCounter):
+    """Recursively constructs back references within the JsonSchema"""
+    if not isinstance(schema, dict):
+        return
+
+    if "$ref" in schema:
+        ref: Ref[Any] = Ref.model_validate(schema)
+        with set_current_doc_path(ref.filepath):
+            ref = ref.flatten()
+        with ref.filepath.open() as f:
+            doc = yaml.safe_load(f)
+        for p in ref.doc_path:
+            doc = doc[p]
+        child = (ref.filepath, ref.doc_path)
+        counter[child].add(this)
+        with set_current_doc_path(ref.filepath):
+            return _count_references(doc, child, counter)
+
+    for v in schema.values():
+        _count_references(v, this, counter)
+
+
+def _populate_jsonschema_recur(
+    schema: Any,
+    counter: ReferenceCounter,
+    shared_schemas: dict[str, Any],
+    ignore_shared: bool = False,
+) -> Any:
+    """Recursively populates JsonSchema $defs object"""
+    if not isinstance(schema, dict):
+        return schema
+
+    if "$ref" in schema:
+        ref: Ref[Any] = Ref.model_validate(schema)
+        with set_current_doc_path(ref.filepath):
+            ref = ref.flatten()
+
+            back_refs = counter[(ref.filepath, ref.doc_path)]
+            if len(back_refs) > 1 and not ignore_shared:
+                ref_struct_name = ref.doc_path[-1]
+                shared_schemas[ref_struct_name] = _populate_jsonschema_recur(
+                    schema, counter, shared_schemas, True
+                )
+                return {"$ref": f"#/$defs/{ref_struct_name}"}
+
+        with ref.filepath.open() as f:
+            doc = yaml.safe_load(f)
+        for p in ref.doc_path:
+            doc = doc[p]
+        with set_current_doc_path(ref.filepath):
+            return _populate_jsonschema_recur(doc, counter, shared_schemas)
+
+    return {
+        k: _populate_jsonschema_recur(v, counter, shared_schemas)
+        for k, v in schema.items()
+    }

{asyncapi_python-0.1.2 → asyncapi_python-0.1.4}/src/asyncapi_python_codegen/generators/amqp/generate.py

@@ -24,6 +24,8 @@ from asyncapi_python_codegen import document as d
 from itertools import chain
 from datamodel_code_generator.__main__ import main as datamodel_codegen
 
+from asyncapi_python_codegen.document.utils import populate_jsonschema_defs
+
 from .utils import snake_case
 
 
@@ -47,7 +49,10 @@ def generate(
             doc.info.description,
             doc.info.version,
         ).items()
-    } | {output_path / "models.py": generate_models(ops, doc.filepath.parent)}
+    } | {
+        output_path / "models.py": generate_models(ops, doc.filepath.parent),
+        output_path / "py.typed": "",
+    }
 
 
 def generate_application(
@@ -69,14 +74,16 @@ def generate_application(
 def generate_models(schemas: list[Operation], cwd: Path) -> str:
     inp = {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "$defs": {
-            type_name: {"$ref": type_schema}
-            for s in schemas
-            for type_name, type_schema in chain(
-                zip(s["input_types"], s["input_schemas"]),
-                zip(s["output_types"], s["output_schemas"]),
-            )
-        },
+        "$defs": populate_jsonschema_defs(
+            {
+                type_name: {"$ref": type_schema}
+                for s in schemas
+                for type_name, type_schema in chain(
+                    zip(s["input_types"], s["input_schemas"]),
+                    zip(s["output_types"], s["output_schemas"]),
+                )
+            }
+        ),
     }
 
     with tempfile.TemporaryDirectory() as dir:
@@ -88,6 +95,14 @@ def generate_models(schemas: list[Operation], cwd: Path) -> str:
         --output { str(models_path.absolute()) }
         --output-model-type pydantic_v2.BaseModel
         --input-file-type jsonschema
+        --reuse-model
+        --allow-extra-fields
+        --collapse-root-models
+        --target-python-version 3.9
+        --use-title-as-name
+        --capitalize-enum-members
+        --snake-case-field
+        --allow-population-by-field-name
         """.split()
 
         with schema_path.open("w") as schema: