Merge remote-tracking branch 'origin/0.6.0' into issue-151-publish-api-specs

Author: Sergio García Prado

.github/workflows/minos-router-graphql-publish.yml

@@ -0,0 +1,33 @@
+name: "Publish: minos-router-graphql"
+
+on:
+  push:
+    branches:
+      - '*.*.x'
+    paths:
+      - 'packages/plugins/minos-router-graphql/**'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    container: python:3.9-buster
+    defaults:
+      run:
+        working-directory: packages/plugins/minos-router-graphql
+
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+
+      - name: Install dependencies
+        run: make install
+
+      - name: Publish package
+        run: make release
+        env:
+          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

.github/workflows/minos-router-graphql-tests.yml

@@ -0,0 +1,66 @@
+name: "Test: minos-router-graphql"
+
+on:
+  push:
+    branches:
+      - main
+      - '*.*.x'
+  pull_request:
+    paths:
+      - 'packages/plugins/minos-router-graphql/**'
+      - 'packages/core/minos-microservice-networks/**'
+      - 'packages/core/minos-microservice-common/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: python:3.9-buster
+    defaults:
+      run:
+        working-directory: packages/plugins/minos-router-graphql
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: minos
+          POSTGRES_PASSWORD: min0s
+          POSTGRES_DB: order_db
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+      MINOS_BROKER_QUEUE_HOST: postgres
+      MINOS_BROKER_HOST: kafka
+      MINOS_REPOSITORY_HOST: postgres
+      MINOS_SNAPSHOT_HOST: postgres
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+
+      - name: Install dependencies
+        run: make install
+
+      - name: Lint package
+        run: make lint
+
+      - name: Test package with coverage
+        run: make coverage
+
+      - name: Publish coverage
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./packages/plugins/minos-router-graphql/coverage.xml
+          fail_ci_if_error: true
+
+      - name: Generate documentation
+        run: make docs
+
+      - name: Generate build
+        run: make dist

.gitignore

@@ -325,3 +325,5 @@ $RECYCLE.BIN/
 # Sphinx Api Documentation
 **/docs/api*
 **/docs/_build
+
+tutorials/stock-wallet/stacks

.pre-commit-config.yaml

@@ -44,16 +44,23 @@ repos:
                 files: ^packages/plugins/minos-broker-kafka/
                 language: system
 
+            -   id: minos-discovery-minos-check
+                pass_filenames: false
+                entry: make --directory=packages/plugins/minos-discovery-minos check
+                name: Check minos-discovery-minos
+                files: ^packages/plugins/minos-discovery-minos/
+                language: system
+
             -   id: minos-http-aiohttp-check
                 pass_filenames: false
                 entry: make --directory=packages/plugins/minos-http-aiohttp check
                 name: Check minos-http-aiohttp
                 files: ^packages/plugins/minos-http-aiohttp/
                 language: system
 
-            -   id: minos-discovery-minos-check
+            -   id: minos-router-graphql-check
                 pass_filenames: false
-                entry: make --directory=packages/plugins/minos-discovery-minos check
-                name: Check minos-discovery-minos
-                files: ^packages/plugins/minos-discovery-minos/
+                entry: make --directory=packages/plugins/minos-router-graphql check
+                name: Check minos-router-graphql
+                files: ^packages/plugins/minos-router-graphql/
                 language: system

.sonarcloud.properties

@@ -1,2 +1,3 @@
 sonar.python.version=3.9
 sonar.exclusions=tutorials/**
+sonar.cpd.exclusions=**/tests/**

README.md

@@ -1157,6 +1157,7 @@ The plugin packages provide connectors to external technologies like brokers, di
 * [minos-broker-kafka](https://minos-framework.github.io/minos-python/packages/plugins/minos-broker-kafka): The `kafka` plugin package.
 * [minos-discovery-minos](https://minos-framework.github.io/minos-python/packages/plugins/minos-discovery-minos): The `minos-discovery` plugin package.
 * [minos-http-aiohttp](https://minos-framework.github.io/minos-python/packages/plugins/minos-http-aiohttp): The `aiohttp` plugin package.
+* [minos-router-graphql](https://minos-framework.github.io/minos-python/packages/plugins/minos-router-graphql): The `grapqhl` plugin package.
 
 ## Source Code
 

packages/core/minos-microservice-aggregate/minos/aggregate/aggregate.py

@@ -8,13 +8,9 @@
     get_args,
 )
 
-from dependency_injector.wiring import (
-    Provide,
-    inject,
-)
-
 from minos.common import (
     Config,
+    Inject,
     NotProvidedException,
     SetupMixin,
 )
@@ -66,31 +62,25 @@ def _from_config(cls, config: Config, **kwargs) -> Aggregate:
 
     # noinspection PyUnusedLocal
     @staticmethod
-    @inject
-    def _get_transaction_repository(
-        transaction_repository: TransactionRepository = Provide["transaction_repository"], **kwargs
-    ) -> TransactionRepository:
-        if transaction_repository is None or isinstance(transaction_repository, Provide):
+    @Inject()
+    def _get_transaction_repository(transaction_repository: TransactionRepository, **kwargs) -> TransactionRepository:
+        if transaction_repository is None:
             raise NotProvidedException(f"A {TransactionRepository!r} object must be provided.")
         return transaction_repository
 
     # noinspection PyUnusedLocal
     @staticmethod
-    @inject
-    def _get_event_repository(
-        event_repository: EventRepository = Provide["event_repository"], **kwargs
-    ) -> EventRepository:
-        if event_repository is None or isinstance(event_repository, Provide):
+    @Inject()
+    def _get_event_repository(event_repository: EventRepository, **kwargs) -> EventRepository:
+        if event_repository is None:
             raise NotProvidedException(f"A {EventRepository!r} object must be provided.")
         return event_repository
 
     # noinspection PyUnusedLocal
     @staticmethod
-    @inject
-    def _get_snapshot_repository(
-        snapshot_repository: SnapshotRepository = Provide["snapshot_repository"], **kwargs
-    ) -> SnapshotRepository:
-        if snapshot_repository is None or isinstance(snapshot_repository, Provide):
+    @Inject()
+    def _get_snapshot_repository(snapshot_repository: SnapshotRepository, **kwargs) -> SnapshotRepository:
+        if snapshot_repository is None:
             raise NotProvidedException(f"A {SnapshotRepository!r} object must be provided.")
         return snapshot_repository
 

packages/core/minos-microservice-aggregate/minos/aggregate/entities/models.py

@@ -17,15 +17,11 @@
     uuid4,
 )
 
-from dependency_injector.wiring import (
-    Provide,
-    inject,
-)
-
 from minos.common import (
     NULL_DATETIME,
     NULL_UUID,
     DeclarativeModel,
+    Inject,
     NotProvidedException,
 )
 
@@ -69,61 +65,65 @@ def __init__(self, uuid: UUID, *args, **kwargs):
         super().__init__(uuid=uuid, *args, **kwargs)
 
 
+T = TypeVar("T", bound="RootEntity")
+
+
 class RootEntity(Entity):
     """Base Root Entity class."""
 
     version: int
     created_at: datetime
     updated_at: datetime
 
-    @inject
+    _event_repository: EventRepository
+    _snapshot_repository: SnapshotRepository
+
+    @Inject()
     def __init__(
         self,
         *args,
         uuid: UUID = NULL_UUID,
         version: int = 0,
         created_at: datetime = NULL_DATETIME,
         updated_at: datetime = NULL_DATETIME,
-        _event_repository: EventRepository = Provide["event_repository"],
-        _snapshot_repository: SnapshotRepository = Provide["snapshot_repository"],
+        _event_repository: EventRepository,
+        _snapshot_repository: SnapshotRepository,
         **kwargs,
     ):
 
         super().__init__(version, created_at, updated_at, *args, uuid=uuid, **kwargs)
 
-        if _event_repository is None or isinstance(_event_repository, Provide):
+        if _event_repository is None:
             raise NotProvidedException(f"A {EventRepository!r} instance is required.")
-        if _snapshot_repository is None or isinstance(_snapshot_repository, Provide):
+        if _snapshot_repository is None:
             raise NotProvidedException(f"A {SnapshotRepository!r} instance is required.")
 
         self._event_repository = _event_repository
         self._snapshot_repository = _snapshot_repository
 
     @classmethod
-    @inject
-    async def get(
-        cls: Type[T], uuid: UUID, *, _snapshot_repository: SnapshotRepository = Provide["snapshot_repository"], **kwargs
-    ) -> T:
+    @Inject()
+    async def get(cls: Type[T], uuid: UUID, *, _snapshot_repository: SnapshotRepository, **kwargs) -> T:
         """Get one instance from the database based on its identifier.
 
         :param uuid: The identifier of the instance.
         :param _snapshot_repository: Snapshot to be set to the root entity.
         :return: A ``RootEntity`` instance.
         """
-        if _snapshot_repository is None or isinstance(_snapshot_repository, Provide):
+        if _snapshot_repository is None:
             raise NotProvidedException(f"A {SnapshotRepository!r} instance is required.")
 
         # noinspection PyTypeChecker
         return await _snapshot_repository.get(cls.classname, uuid, _snapshot_repository=_snapshot_repository, **kwargs)
 
     @classmethod
-    @inject
+    @Inject()
     def get_all(
         cls: Type[T],
         ordering: Optional[_Ordering] = None,
         limit: Optional[int] = None,
         *,
-        _snapshot_repository: SnapshotRepository = Provide["snapshot_repository"],
+        _snapshot_repository: SnapshotRepository,
         **kwargs,
     ) -> AsyncIterator[T]:
         """Get all instance from the database.
@@ -135,7 +135,7 @@ def get_all(
         :param _snapshot_repository: Snapshot to be set to the root entity.
         :return: A ``RootEntity`` instance.
         """
-        if _snapshot_repository is None or isinstance(_snapshot_repository, Provide):
+        if _snapshot_repository is None:
             raise NotProvidedException(f"A {SnapshotRepository!r} instance is required.")
 
         # noinspection PyTypeChecker
@@ -144,14 +144,14 @@ def get_all(
         )
 
     @classmethod
-    @inject
+    @Inject()
     def find(
         cls: Type[T],
         condition: _Condition,
         ordering: Optional[_Ordering] = None,
         limit: Optional[int] = None,
         *,
-        _snapshot_repository: SnapshotRepository = Provide["snapshot_repository"],
+        _snapshot_repository: SnapshotRepository,
         **kwargs,
     ) -> AsyncIterator[T]:
         """Find a collection of instances based on a given ``Condition``.
@@ -164,7 +164,7 @@ def find(
         :param _snapshot_repository: Snapshot to be set to the instances.
         :return: An asynchronous iterator of ``RootEntity`` instances.
         """
-        if _snapshot_repository is None or isinstance(_snapshot_repository, Provide):
+        if _snapshot_repository is None:
             raise NotProvidedException(f"A {SnapshotRepository!r} instance is required.")
         # noinspection PyTypeChecker
         return _snapshot_repository.find(
@@ -352,6 +352,3 @@ def from_diff(cls: Type[T], event: Event, *args, **kwargs) -> T:
             **event.get_fields(),
             **kwargs,
         )
-
-
-T = TypeVar("T", bound=RootEntity)

packages/core/minos-microservice-aggregate/minos/aggregate/entities/refs/resolvers.py

@@ -16,12 +16,8 @@
     UUID,
 )
 
-from dependency_injector.wiring import (
-    Provide,
-    inject,
-)
-
 from minos.common import (
+    Inject,
     Model,
 )
 from minos.networks import (
@@ -48,8 +44,8 @@ class RefResolver:
     """Ref Resolver class."""
 
     # noinspection PyUnusedLocal
-    @inject
-    def __init__(self, broker_pool: BrokerClientPool = Provide["broker_pool"], **kwargs):
+    @Inject()
+    def __init__(self, broker_pool: BrokerClientPool, **kwargs):
         self.broker_pool = broker_pool
 
     # noinspection PyUnusedLocal