everysk-lib 1.9.8__cp311-cp311-win_amd64.whl → 1.10.0__cp311-cp311-win_amd64.whl

everysk/sql/query.py

@@ -8,12 +8,29 @@
 #
 ###############################################################################
 import hashlib
+from functools import partial
 
-from psqlpy.extra_types import JSONB, Text
+from psycopg.types.json import Jsonb, set_json_dumps, set_json_loads
 
 from everysk.core.object import BaseDict
+from everysk.core.serialize import dumps, loads
 from everysk.sql.utils import ConditionOperator
 
+# https://www.psycopg.org/psycopg3/docs/basic/adapt.html#json-adaptation
+set_json_dumps(
+    partial(
+        dumps,
+        add_class_path=True,
+        date_format='%Y-%m-%d',
+        datetime_format='%Y-%m-%dT%H:%M:%S',
+        indent=None,
+        separators=(',', ':'),
+        use_undefined=True,
+    )
+)
+set_json_loads(partial(loads, use_undefined=True, instantiate_object=True))
+
+
 ## Constants
 _SQL_FIELDS = {
     'bool': 'BOOLEAN',
@@ -42,7 +59,7 @@ _SQL_CREATE_SCHEMA = 'CREATE SCHEMA IF NOT EXISTS "{schema}"'
 _SQL_CREATE_TABLE = 'CREATE TABLE IF NOT EXISTS "{schema}"."{table}" ({fields})'
 
 # https://www.postgresqltutorial.com/postgresql-delete/
-_SQL_DELETE = 'DELETE FROM "{schema}"."{table}" WHERE "{primary_key}" = ANY($(ids)p)'
+_SQL_DELETE = 'DELETE FROM "{schema}"."{table}" WHERE "{primary_key}" = ANY(%(ids)s)'
 
 # https://www.postgresqltutorial.com/postgresql-tutorial/postgresql-upsert/
 # https://stackoverflow.com/a/30917361
@@ -201,11 +218,13 @@ class Query:
 
         try:
             offset = int(offset)
-        except (ValueError, TypeError):
-            raise TypeError('Offset must be an integer or a string representing it.')
+        except (ValueError, TypeError) as error:
+            msg = 'Offset must be an integer or a string representing it.'
+            raise TypeError(msg) from error
 
         if offset < 0:
-            raise TypeError('Offset must not be negative.')
+            msg = 'Offset must not be negative.'
+            raise TypeError(msg)
 
         if offset == 0:
             return ''
@@ -296,7 +315,7 @@ class Query:
         """
         # Create the values string
         # We do not use " here because we are using the values as placeholders
-        values = ', '.join(f'$({field})p' for field in fields)
+        values = ', '.join(f'%({field})s' for field in fields)
 
         # Create the SQL query
         update = ', '.join(f'"{field}" = EXCLUDED."{field}"' for field in fields)
@@ -320,17 +339,14 @@ class Query:
         Args:
             params (dict): A dictionary of parameters to prepare.
         """
-        # https://psqlpy-python.github.io/usage/types/extra_types.html
+        # https://www.psycopg.org/psycopg3/docs/basic/adapt.html#json-adaptation
         for key, value in params.items():
             if isinstance(value, (set, tuple)):
-                params[key] = JSONB(list(value))
-            elif isinstance(value, list):
-                params[key] = JSONB(value)
+                params[key] = Jsonb(list(value))
+            elif isinstance(value, (dict, list)):
+                params[key] = Jsonb(value)
             elif isinstance(value, BaseDict):
-                params[key] = JSONB(value.to_dict())
-            elif isinstance(value, str):
-                # Text is needed to differentiate between VARCHAR and TEXT
-                params[key] = Text(value)
+                params[key] = Jsonb(value.to_dict())
 
         return params
 

everysk/sql/row_factory.py

@@ -0,0 +1,63 @@
+###############################################################################
+#
+# (C) Copyright 2025 EVERYSK TECHNOLOGIES
+#
+# This is an unpublished work containing confidential and proprietary
+# information of EVERYSK TECHNOLOGIES. Disclosure, use, or reproduction
+# without authorization of EVERYSK TECHNOLOGIES is prohibited.
+#
+###############################################################################
+from collections.abc import Callable, Iterable
+from typing import Any
+
+from psycopg import Cursor
+from psycopg.rows import _get_names, no_result
+
+
+def cls_row(cls: type, loads: Callable | None = None) -> Callable:
+    """
+    Function to convert a row from a cursor to an instance of the specified class.
+
+    Args:
+        cls (type): The class to instantiate for each row.
+        loads (callable | None, optional): Optional function to process each value. Defaults to None.
+    """
+
+    def inner(cursor: Cursor) -> Callable:
+        names = _get_names(cursor)
+        if names is None:
+            return no_result
+
+        def cls_row_(values: Iterable) -> Any:
+            if loads is None:
+                return cls(**dict(zip(names, values, strict=True)))
+
+            return cls(**dict(zip(names, map(loads, values), strict=True)))
+
+        return cls_row_
+
+    return inner
+
+
+def dict_row(loads: Callable | None = None) -> Callable:
+    """
+    Function to convert a row from a cursor to a dictionary.
+
+    Args:
+        loads (Callable | None): Optional function to process each value. Defaults to None.
+    """
+
+    def inner(cursor: Cursor) -> Callable:
+        names = _get_names(cursor)
+        if names is None:
+            return no_result
+
+        def dict_row_(values: Iterable) -> dict[str, Any]:
+            if loads is None:
+                return dict(zip(names, values, strict=True))
+
+            return dict(zip(names, map(loads, values), strict=True))
+
+        return dict_row_
+
+    return inner

everysk/sql/settings.py

@@ -17,6 +17,29 @@ POSTGRESQL_CONNECTION_PASSWORD: str = None
 POSTGRESQL_CONNECTION_PORT: int = 5432
 POSTGRESQL_CONNECTION_HOST: str = None
 POSTGRESQL_CONNECTION_USER: str = None
-# Disable, Allow, Prefer, Require, VerifyCA, VerifyFull
-POSTGRESQL_CONNECTION_ENCRYPTION: str = 'Prefer'
 POSTGRESQL_POOL_MAX_SIZE: int = 10
+POSTGRESQL_POOL_MIN_SIZE: int = 1
+
+# https://www.psycopg.org/psycopg3/docs/api/pool.html
+# Maximum time, in seconds, that a connection can stay unused in the pool before being closed, and the pool shrunk.
+# This only happens to connections more than min_size, if max_size allowed the pool to grow.
+POSTGRESQL_POOL_MAX_IDLE: int = 60 * 5  # 5 minutes
+
+# The maximum lifetime of a connection in the pool, in seconds. Connections used for longer get closed and replaced by
+# a new one. The amount is reduced by a random 10% to avoid mass eviction.
+POSTGRESQL_POOL_MAX_LIFETIME: int = 60 * 30  # 30 minutes
+
+# Maximum number of requests that can be queued to the pool, after which new requests will fail.
+# Raising TooManyRequests, 0 means no queue limit.
+POSTGRESQL_POOL_MAX_WAITING: int = 0
+
+# If the connections are opened on init or later.
+POSTGRESQL_POOL_OPEN: bool = True
+
+# Maximum time, in seconds, the pool will try to create a connection. If a connection attempt fails, the pool will try
+# to reconnect a few times, using an exponential backoff and some random factor to avoid mass attempts.
+POSTGRESQL_POOL_RECONNECT_TIMEOUT: int = 60 * 2  # 2 minutes
+
+# The default maximum time in seconds that a client can wait to receive a connection
+# from the pool (using connection() or getconn()).
+POSTGRESQL_POOL_TIMEOUT: int = 30  # 30 seconds

everysk/sql/utils.py

@@ -17,6 +17,7 @@ _SQL_OPERATORS = {
     'ilike': 'ILIKE',
     'in': 'IN',
     'inside': '?',
+    'insidebinary': '?|',
     'isnotnull': 'IS NOT NULL',
     'isnull': 'IS NULL',
     'like': 'LIKE',
@@ -58,8 +59,8 @@ class ConditionOperator:
 
     ## Operators methods
     def _operator_default(self) -> tuple[str, Any]:
-        """Default operator method "field" <operator> $(field)p."""
-        operation = f'{self.sql_operator} $({self.field_operator})p'
+        """Default operator method "field" <operator> %(field)s."""
+        operation = f'{self.sql_operator} %({self.field_operator})s'
         sql = f'"{self.field}" {operation}'
         return sql, self.value
 
@@ -69,9 +70,9 @@ class ConditionOperator:
         return sql, f'%{value}'
 
     def _operator_in(self) -> tuple[str, list]:
-        """Operator method for in: "field" = ANY($(field__in)p)."""
+        """Operator method for in: "field" = ANY(%(field__in)s)."""
         # https://www.psycopg.org/psycopg3/docs/basic/from_pg2.html#you-cannot-use-in-s-with-a-tuple
-        operation = f'ANY($({self.field_operator})p)'
+        operation = f'ANY(%({self.field_operator})s)'
         sql = f'"{self.field}" = {operation}'
         if isinstance(self.value, str):
             return sql, self.value.split(',')
@@ -98,8 +99,8 @@ class ConditionOperator:
         return self._operator_like()
 
     def _operator_nin(self) -> tuple[str, list]:
-        """Operator method for nin: "field" != ALL($(field__nin)p)."""
-        operation = f'ALL($({self.field_operator})p)'
+        """Operator method for nin: "field" != ALL(%(field__nin)s)."""
+        operation = f'ALL(%({self.field_operator})s)'
         sql = f'"{self.field}" != {operation}'
         if isinstance(self.value, str):
             return sql, self.value.split(',')
@@ -119,7 +120,7 @@ class ConditionOperator:
         Example:
             field__operator = 'age__gt'
             value = 30
-            returns: ('"age" > $(age__gt)p', 30)
+            returns: ('"age" > %(age__gt)s', 30)
         """
         method_name = f'_operator_{self.operator}'
         if hasattr(self, method_name):

everysk/tests.py

@@ -17,6 +17,7 @@ except ModuleNotFoundError as error:
         raise
 
 from everysk.core.tests import *
+from everysk.sdk.brutils.tests import *
 from everysk.sdk.tests import *
 from everysk.server.tests import *
 from everysk.sql.tests import *

{everysk_lib-1.9.8.dist-info → everysk_lib-1.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: everysk-lib
-Version: 1.9.8
+Version: 1.10.0
 Summary: Generic lib to share python code on Everysk.
 License-Expression: LicenseRef-Proprietary
 Project-URL: Homepage, https://everysk.com/
@@ -19,13 +19,13 @@ Provides-Extra: requests
 Requires-Dist: certifi==2025.10.5; extra == "requests"
 Requires-Dist: charset_normalizer==3.4.4; extra == "requests"
 Requires-Dist: idna==3.11; extra == "requests"
-Requires-Dist: urllib3==2.5.0; extra == "requests"
+Requires-Dist: urllib3==2.6.3; extra == "requests"
 Requires-Dist: requests==2.32.5; extra == "requests"
 Provides-Extra: firestore
 Requires-Dist: certifi==2025.10.5; extra == "firestore"
 Requires-Dist: charset-normalizer==3.3.2; extra == "firestore"
 Requires-Dist: idna==3.6; extra == "firestore"
-Requires-Dist: urllib3==2.5.0; extra == "firestore"
+Requires-Dist: urllib3==2.6.3; extra == "firestore"
 Requires-Dist: requests==2.32.4; extra == "firestore"
 Requires-Dist: pyasn1==0.5.1; extra == "firestore"
 Requires-Dist: pyasn1-modules==0.3.0; extra == "firestore"
@@ -47,7 +47,7 @@ Provides-Extra: tasks
 Requires-Dist: certifi==2025.10.5; extra == "tasks"
 Requires-Dist: charset-normalizer==3.3.2; extra == "tasks"
 Requires-Dist: idna==3.6; extra == "tasks"
-Requires-Dist: urllib3==2.5.0; extra == "tasks"
+Requires-Dist: urllib3==2.6.3; extra == "tasks"
 Requires-Dist: requests==2.32.4; extra == "tasks"
 Requires-Dist: pyasn1==0.5.1; extra == "tasks"
 Requires-Dist: pyasn1-modules==0.3.0; extra == "tasks"
@@ -115,7 +115,9 @@ Requires-Dist: lark==1.2.2; extra == "expression"
 Requires-Dist: numpy==1.26.4; extra == "expression"
 Requires-Dist: pandas==2.1.4; extra == "expression"
 Provides-Extra: postgresql
-Requires-Dist: psqlpy==0.11.9; extra == "postgresql"
+Requires-Dist: psycopg-binary==3.3.0; extra == "postgresql"
+Requires-Dist: psycopg-pool==3.3.0; extra == "postgresql"
+Requires-Dist: psycopg==3.3.0; extra == "postgresql"
 Dynamic: license-file
 
 

{everysk_lib-1.9.8.dist-info → everysk_lib-1.10.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 everysk/__init__.py,sha256=JeZGK9kmTaBRR6H4et-3UYE6x8D7xsFtrTnJ_tQXG_Q,1039
 everysk/_version.py,sha256=_OPcym8X5j0fiafJLlKp8ADhMP5pHKqD2YySbH9f1PY,24501
 everysk/config.py,sha256=PKwYhzgBUIQ2m_cS5muBRWssZa4I3B6D5Qa9eSqAu18,16653
-everysk/settings.py,sha256=sU051hpzszM0SgZzn4vAOhEuEU_j9rEU7Gv9nWx1aEg,3936
-everysk/tests.py,sha256=-btpbhDDF2CGIIDr4vra38HrSu7kXrV3o9Hgci90lNc,844
+everysk/settings.py,sha256=Z_wPLDcAxjd6gW2lH6J8n6Q2j-x3V_AJGJmR5NapzBo,4008
+everysk/tests.py,sha256=MlZ4_IXk639-tyTtmdWWMJD98bPK0eunRFCPZopj2fs,884
 everysk/utils.py,sha256=nejrDn5n75YBk3BinEiDY5JhhdB7BaHX_9wpJ20RvXs,2654
 everysk/version.py,sha256=q8j2yDrdm4lEtGtOIt4tY4TUlctwQYJJcVqscDabikA,617
 everysk/api/__init__.py,sha256=nD4G5flQ8gbgmIVk7Ap-dktnJdiIMj45QnKxMKAPeAA,2250
@@ -37,12 +37,13 @@ everysk/core/log.py,sha256=qFRW9bO6jaELwrJ0MIaEUm2-uYFIyTbH2bQ3j0XpPio,30239
 everysk/core/number.py,sha256=Al_9LLu7hj_4fTLPTiN3dzQvxctmMxB5i9I4Z4X5Lro,1204
 everysk/core/object.py,sha256=9XMSPDlgLtGTKJLVimRIND4a7U1e_rZrERJGZw2j_lQ,53924
 everysk/core/redis.py,sha256=HrG58dc_3EHnti2sBaijcyN8Hq4u3p1zst6-CSK9ySQ,36664
+everysk/core/retry.py,sha256=wLU0fNKP7cNYKkYxMTjR--YFYM0ahXWP-39O_FObwfo,1897
 everysk/core/serialize.py,sha256=8P5C7V98tB9vAQBEdu0NqMt8lktsD-Ol5REpTG1vNlw,25155
 everysk/core/sftp.py,sha256=01_iDxqhcAO3FFKUp-8myV7qtf3I-Mi_cLZ6KrAfsGw,15600
 everysk/core/signing.py,sha256=vImkFEiunqD-oO3e9Oi88z0x0jEEfO1lDIbC9RYxTn8,1956
 everysk/core/slack.py,sha256=r9QH6RRe74Jz4-8XWLqbYq21msIlsVuC4fr_VUMFZPE,4394
 everysk/core/string.py,sha256=K1BRlRNuhqlI7gdqOi40hjTHuxm1fF-RLqIAwm74eHc,5456
-everysk/core/tests.py,sha256=8zTef-BgIeMkV8QxWh-OEZy3wgJhVIRLNq9zj0VRg9E,11486
+everysk/core/tests.py,sha256=qrfAfUDmgCvBn99X73fL5MUTo1P33gq0ftP5CTJetCc,14491
 everysk/core/threads.py,sha256=CcL4Nv2Zzdxt1xjo0CbLSttSU29xHgSRiWF_JXr3GAA,7167
 everysk/core/undefined.py,sha256=sNvP9qJJi3TINPSJiIWjqKz4o5DNBBYparoTRrDtJ_0,2757
 everysk/core/unittests.py,sha256=ujGqGHCUAI25P4UgwHn9GpZAMBdqZ-lxxGERrckthIM,3289
@@ -67,13 +68,15 @@ everysk/sdk/base.py,sha256=aOhguqj-WfyHYm_qO5G675JdF5iJKf6x0Abt4jYKb_8,3668
 everysk/sdk/settings.py,sha256=S9l3ZwC6jZwTvr_bnQtvwXJSKFsRF7yKj2btptd3abs,3147
 everysk/sdk/tests.py,sha256=pZPSxu2roMCLFWHhnZFCSlA4nv_mFkwqNBkDsVfZ8GU,7611
 everysk/sdk/worker_base.py,sha256=31zDyLtttU25h2kNbwk4yn0tTxHaIc_Ysq5Grm9A9d8,1555
+everysk/sdk/brutils/cnpj.py,sha256=Dh3zcBiQoWm8gI5mV_-dv4a35Z0D8lSMGDcbCkdk3DE,12852
+everysk/sdk/brutils/cnpj_pd.py,sha256=7NwIbIq2zupneAblxs2caspzNcdQcwdkDMyAGvgw7SU,1524
 everysk/sdk/engines/__init__.py,sha256=1v06RoWC4qfxkfUdbQGF3yCuskXjrvbb_yF_6XCpO5E,1153
 everysk/sdk/engines/cache.py,sha256=uCFfBVfEyjHRxTNiPXMFehPWaq8k0DbQ50f40JHt4Qg,6580
 everysk/sdk/engines/compliance.py,sha256=Kd2buYlcKfUHEGmeZrGgT2JOnC7p12UOlDwFS69ssEM,1432
 everysk/sdk/engines/cryptography.py,sha256=y07mfKbNDK86j4CnfmqqdL2KWBf0s6WN7xjuL-iS6g4,2111
-everysk/sdk/engines/expression.cp311-win_amd64.pyd,sha256=UALUIsXXrTV0OaF6xnrEGEk5KgotXK3yGDiqnUFJ5ug,3797504
+everysk/sdk/engines/expression.cp311-win_amd64.pyd,sha256=IuJ22ovJLYxN8F1fShlVDfx99VFSghZbu-kMFY_WGs8,3797504
 everysk/sdk/engines/expression.pyi,sha256=ghE_B4tua8hqo7IahSWxl_5fJ_ONF8RVMgSM4Hf_NpU,1265
-everysk/sdk/engines/helpers.cp311-win_amd64.pyd,sha256=6-vwRelEq5r6pjvGnAzVoNVxECk9TkK_XjF4N8lt5Lc,1040384
+everysk/sdk/engines/helpers.cp311-win_amd64.pyd,sha256=c5-Ld3b5oYmx79WqkWG79J-sAjAX1uH_noFETPsyqPU,1039872
 everysk/sdk/engines/helpers.pyi,sha256=CIcomtg79QWisRscba-Trs0X4tOlMT1gxykZjM90KYA,482
 everysk/sdk/engines/lock.py,sha256=rPFY3e2hrKiRyFE0iHAuMad7Cv0KQBJsF9SbZcx43D0,4709
 everysk/sdk/engines/market_data.py,sha256=lyMl_IOAEobFzzo6Jrtxa9ht95BJEmTUR6bXkLGaZLM,9426
@@ -120,14 +123,15 @@ everysk/server/routing.py,sha256=tHmmokv8msPY37T9F9_lovLZ9NP8bC8G_kxV92aM-tg,242
 everysk/server/settings.py,sha256=C9nM3PYZQOKjq9KB2DB4ojGkkTJtj5pslWrUdMGYEwk,1309
 everysk/server/tests.py,sha256=caw6jaXM0xjdi7Y10JpqUTCyUrUmKpG3uxigLcVRdew,1885
 everysk/sql/__init__.py,sha256=lXZAWXrI2tlzw9uvJyThaWnksZqdbemQ2tqe-e7wUiU,413
-everysk/sql/connection.py,sha256=uFp4EEsc4fX2rnmvQsHTpLZnWiUf1fpt4FSSZvPYhdk,5718
-everysk/sql/model.py,sha256=AzhGSYq9o_ekmpKmDcD6-9FEghd3_JzOiqGbapqhm_A,14756
-everysk/sql/query.py,sha256=vybpvTI4oieI6b9uGCPkRnb1YgZ3sNKOyzemKOHroaA,13757
-everysk/sql/settings.py,sha256=aQ6z1ZYtulmqwA4G7u-jx_OV_4IWPNgv5r9sfNWNh3A,864
-everysk/sql/utils.py,sha256=Or2Cs4wVp6fKQXuGP7e_bPvc88pP-PZ3AoSEDT7G_dA,4301
-everysk_lib-1.9.8.dist-info/licenses/LICENSE.txt,sha256=Q5YxWA62m0TsmpEmHeoRHg4oPu_8ektkZ3FWWm1pQWo,311
-everysk_lib-1.9.8.dist-info/.gitignore,sha256=0A1r9HzLhR7IQ1rGPjbaW5HC6oIQ7xzVYZ1z1ZaVfmw,183
-everysk_lib-1.9.8.dist-info/METADATA,sha256=gHfW4VXcvifo9ioAYH3Qf0qnozDfDLWnyNiyZ6jbFZc,13286
-everysk_lib-1.9.8.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
-everysk_lib-1.9.8.dist-info/top_level.txt,sha256=1s1Lfhd4gXolqzkh-ay3yy-EZKPiKnJfbZwx2fybxyk,14
-everysk_lib-1.9.8.dist-info/RECORD,,
+everysk/sql/connection.py,sha256=PujKm1i5gAvxU_FVT7IDuMb38D52dII52Gk8RI0vC_0,7928
+everysk/sql/model.py,sha256=syHHTTS4JRTj_2Mu9ugmMu4b6qUY12t3VgfE3hSxYIc,14559
+everysk/sql/query.py,sha256=yO2EoGoUoGace_9BNKN8jeyFV30yCrAhefAvGHqIFE4,14174
+everysk/sql/row_factory.py,sha256=FEtB4d12ACT3Bp6g2k_Ty2p2HpTkPoVqODUS1_kSXys,1936
+everysk/sql/settings.py,sha256=g5ZVm4Y3fhWGeXgTW6D309waGRBx2S6Ima4nY6ByTZw,2103
+everysk/sql/utils.py,sha256=Hbk9INEcz12FoBeDvHh9qh0dTSmTCWAn_S1anJOJb1o,4327
+everysk_lib-1.10.0.dist-info/licenses/LICENSE.txt,sha256=Q5YxWA62m0TsmpEmHeoRHg4oPu_8ektkZ3FWWm1pQWo,311
+everysk_lib-1.10.0.dist-info/.gitignore,sha256=0A1r9HzLhR7IQ1rGPjbaW5HC6oIQ7xzVYZ1z1ZaVfmw,183
+everysk_lib-1.10.0.dist-info/METADATA,sha256=D9ce4vT0AE0HhRR973hNbOfp0QKx31RQIJCtOZzSSEU,13407
+everysk_lib-1.10.0.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
+everysk_lib-1.10.0.dist-info/top_level.txt,sha256=1s1Lfhd4gXolqzkh-ay3yy-EZKPiKnJfbZwx2fybxyk,14
+everysk_lib-1.10.0.dist-info/RECORD,,