Merge pull request #392 from Clariteia/0.0.16

0.0.16
Clariteia · Sep 20, 2021 · 810fd13 · 810fd13
2 parents 91bf63c + d7353f2
commit 810fd13
Show file tree

Hide file tree

Showing 97 changed files with 644 additions and 785 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -90,3 +90,10 @@ History
 ------------------
 
 * Add support for `__get_enroute__` method by `EnrouteAnalyzer`.
+
+0.0.16 (2021-09-20)
+------------------
+
+* Add support for `Kong` discovery.
+* Add support for `minos-microservice-common>=0.1.13`.
+* Fix bug related with database queues and plain dates (without timezones).
diff --git a/minos/networks/__init__.py b/minos/networks/__init__.py
@@ -1,6 +1,4 @@
-"""minos.networks module."""
-
-__version__ = "0.0.15"
+__version__ = "0.0.16"
 
 from .brokers import (
     Broker,
@@ -26,14 +24,17 @@
     enroute,
 )
 from .discovery import (
+    DiscoveryClient,
     DiscoveryConnector,
+    KongDiscoveryClient,
     MinosDiscoveryClient,
 )
 from .exceptions import (
     MinosActionNotFoundException,
     MinosDiscoveryConnectorException,
     MinosHandlerException,
     MinosHandlerNotFoundEnoughEntriesException,
+    MinosInvalidDiscoveryClient,
     MinosMultipleEnrouteDecoratorKindsException,
     MinosNetworkException,
     MinosRedefinedEnrouteDecoratorException,

diff --git a/minos/networks/brokers/__init__.py b/minos/networks/brokers/__init__.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from .abc import (
     Broker,
     BrokerSetup,

diff --git a/minos/networks/brokers/abc.py b/minos/networks/brokers/abc.py
@@ -1,16 +1,6 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from abc import (
     ABC,
 )
-from typing import (
-    NoReturn,
-)
 
 from psycopg2.sql import (
     SQL,
@@ -25,10 +15,10 @@
 class BrokerSetup(PostgreSqlMinosDatabase):
     """Minos Broker Setup Class"""
 
-    async def _setup(self) -> NoReturn:
+    async def _setup(self) -> None:
         await self._create_broker_table()
 
-    async def _create_broker_table(self) -> NoReturn:
+    async def _create_broker_table(self) -> None:
         await self.submit_query(_CREATE_TABLE_QUERY, lock=hash("producer_queue"))
 
 
@@ -44,7 +34,7 @@ async def enqueue(self, topic: str, raw: bytes) -> int:
         :param raw: Bytes sequence to be send.
         :return: The identifier of the message in the queue.
         """
-        params = (topic, raw, 0, self.ACTION)
+        params = (topic, raw, self.ACTION)
         raw = await self.submit_query_and_fetchone(_INSERT_ENTRY_QUERY, params)
         await self.submit_query(_NOTIFY_QUERY)
         return raw[0]
@@ -54,17 +44,13 @@ async def enqueue(self, topic: str, raw: bytes) -> int:
     "CREATE TABLE IF NOT EXISTS producer_queue ("
     "id BIGSERIAL NOT NULL PRIMARY KEY, "
     "topic VARCHAR(255) NOT NULL, "
-    "model BYTEA NOT NULL, "
-    "retry INTEGER NOT NULL, "
+    "data BYTEA NOT NULL, "
     "action VARCHAR(255) NOT NULL, "
-    "creation_date TIMESTAMP NOT NULL, "
-    "update_date TIMESTAMP NOT NULL)"
+    "retry INTEGER NOT NULL DEFAULT 0, "
+    "created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), "
+    "updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW())"
 )
 
-_INSERT_ENTRY_QUERY = SQL(
-    "INSERT INTO producer_queue (topic, model, retry, action, creation_date, update_date) "
-    "VALUES (%s, %s, %s, %s, NOW(), NOW()) "
-    "RETURNING id"
-)
+_INSERT_ENTRY_QUERY = SQL("INSERT INTO producer_queue (topic, data, action) VALUES (%s, %s, %s) RETURNING id")
 
 _NOTIFY_QUERY = SQL("NOTIFY producer_queue")
diff --git a/minos/networks/brokers/command_replies.py b/minos/networks/brokers/command_replies.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from __future__ import (
     annotations,
 )

diff --git a/minos/networks/brokers/commands.py b/minos/networks/brokers/commands.py
@@ -1,5 +1,3 @@
-"""minos.networks.brokers.commands module."""
-
 from __future__ import (
     annotations,
 )

diff --git a/minos/networks/brokers/events.py b/minos/networks/brokers/events.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from __future__ import (
     annotations,
 )

diff --git a/minos/networks/brokers/producers.py b/minos/networks/brokers/producers.py
@@ -1,5 +1,3 @@
-"""minos.networks.brokers.producers module."""
-
 from __future__ import (
     annotations,
 )
@@ -165,7 +163,7 @@ async def dispatch_one(self, row: tuple) -> bool:
         :param row: A row containing the message information.
         :return: ``True`` if everything was fine or ``False`` otherwise.
         """
-        topic, message, action = row[1], row[2], row[4]
+        topic, message, action = row[1], row[2], row[3]
 
         # noinspection PyBroadException
         try:
@@ -209,15 +207,15 @@ def client(self) -> AIOKafkaProducer:
     "SELECT * "
     "FROM producer_queue "
     "WHERE retry < %s "
-    "ORDER BY creation_date "
+    "ORDER BY created_at "
     "LIMIT %s "
     "FOR UPDATE "
     "SKIP LOCKED"
 )
 
 _DELETE_PROCESSED_QUERY = SQL("DELETE FROM producer_queue WHERE id = %s")
 
-_UPDATE_NOT_PROCESSED_QUERY = SQL("UPDATE producer_queue SET retry = retry + 1 WHERE id = %s")
+_UPDATE_NOT_PROCESSED_QUERY = SQL("UPDATE producer_queue SET retry = retry + 1, updated_at = NOW() WHERE id = %s")
 
 _LISTEN_QUERY = SQL("LISTEN producer_queue")
 

diff --git a/minos/networks/brokers/services.py b/minos/networks/brokers/services.py
@@ -1,5 +1,3 @@
-"""minos.networks.brokers.services module."""
-
 from __future__ import (
     annotations,
 )

diff --git a/minos/networks/decorators/__init__.py b/minos/networks/decorators/__init__.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from .analyzers import (
     EnrouteAnalyzer,
 )

diff --git a/minos/networks/decorators/analyzers.py b/minos/networks/decorators/analyzers.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from inspect import (
     getmembers,
     isfunction,

diff --git a/minos/networks/decorators/api.py b/minos/networks/decorators/api.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from .definitions import (
     BrokerCommandEnrouteDecorator,
     BrokerEventEnrouteDecorator,

diff --git a/minos/networks/decorators/builders.py b/minos/networks/decorators/builders.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from inspect import (
     iscoroutinefunction,
 )

diff --git a/minos/networks/decorators/definitions/__init__.py b/minos/networks/decorators/definitions/__init__.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from .abc import (
     EnrouteDecorator,
 )

diff --git a/minos/networks/decorators/definitions/abc.py b/minos/networks/decorators/definitions/abc.py
@@ -1,9 +1,3 @@
-# Copyright (C) 2020 Clariteia SL
-#
-# This file is part of minos framework.
-#
-# Minos framework can not be copied and/or distributed without the express
-# permission of Clariteia SL.
 from __future__ import (
     annotations,
 )
@@ -20,7 +14,6 @@
     Callable,
     Final,
     Iterable,
-    NoReturn,
     Optional,
     Union,
 )
@@ -36,7 +29,7 @@
     EnrouteDecoratorKind,
 )
 
-Adapter = Callable[[Request], Union[Response, NoReturn, None, Awaitable[Union[Response, NoReturn, None]]]]
+Adapter = Callable[[Request], Union[Optional[Response], Awaitable[Optional[Response]]]]
 
 
 class EnrouteDecorator(ABC):

diff --git a/minos/networks/decorators/definitions/broker.py b/minos/networks/decorators/definitions/broker.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from abc import (
     ABC,
 )

diff --git a/minos/networks/decorators/definitions/kinds.py b/minos/networks/decorators/definitions/kinds.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from enum import (
     Enum,
     auto,

diff --git a/minos/networks/decorators/definitions/rest.py b/minos/networks/decorators/definitions/rest.py
@@ -1,10 +1,3 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from abc import (
     ABC,
 )

diff --git a/minos/networks/discovery/__init__.py b/minos/networks/discovery/__init__.py
@@ -1,11 +1,6 @@
-"""
-Copyright (C) 2021 Clariteia SL
-
-This file is part of minos framework.
-
-Minos framework can not be copied and/or distributed without the express permission of Clariteia SL.
-"""
 from .clients import (
+    DiscoveryClient,
+    KongDiscoveryClient,
     MinosDiscoveryClient,
 )
 from .connectors import (

diff --git a/minos/networks/discovery/clients/__init__.py b/minos/networks/discovery/clients/__init__.py
@@ -0,0 +1,9 @@
+from .abc import (
+    DiscoveryClient,
+)
+from .kong import (
+    KongDiscoveryClient,
+)
+from .minos import (
+    MinosDiscoveryClient,
+)