sqlalchemy-iris 0.13.4b4__py3-none-any.whl → 0.14.1b1__py3-none-any.whl

sqlalchemy_iris/base.py

@@ -91,7 +91,6 @@ from .types import IRISTime
 from .types import IRISTimeStamp
 from .types import IRISDate
 from .types import IRISDateTime
-from .types import IRISUniqueIdentifier
 from .types import IRISListBuild  # noqa
 from .types import IRISVector  # noqa
 
@@ -819,8 +818,10 @@ colspecs = {
     sqltypes.DateTime: IRISDateTime,
     sqltypes.TIMESTAMP: IRISTimeStamp,
     sqltypes.Time: IRISTime,
-    sqltypes.UUID: IRISUniqueIdentifier,
 }
+if sqlalchemy_version.startswith("2."):
+    from .types import IRISUniqueIdentifier
+    colspecs[sqltypes.UUID] = IRISUniqueIdentifier
 
 
 class IRISExact(ReturnTypeFromArgs):

sqlalchemy_iris/types.py

@@ -2,9 +2,10 @@ import datetime
 from decimal import Decimal
 from sqlalchemy import func, text
 from sqlalchemy.sql import sqltypes
-from sqlalchemy.types import UserDefinedType, Float
+from sqlalchemy.types import UserDefinedType
 from uuid import UUID as _python_UUID
 from intersystems_iris import IRISList
+from sqlalchemy import __version__ as sqlalchemy_version
 
 HOROLOG_ORDINAL = datetime.date(1840, 12, 31).toordinal()
 
@@ -134,73 +135,79 @@ class IRISTime(sqltypes.DateTime):
         return process
 
 
-class IRISUniqueIdentifier(sqltypes.Uuid):
-    def literal_processor(self, dialect):
-        if not self.as_uuid:
+if sqlalchemy_version.startswith("2."):
 
-            def process(value):
-                return f"""'{value.replace("'", "''")}'"""
-
-            return process
-        else:
-
-            def process(value):
-                return f"""'{str(value).replace("'", "''")}'"""
-
-            return process
-
-    def bind_processor(self, dialect):
-        character_based_uuid = not dialect.supports_native_uuid or not self.native_uuid
-
-        if character_based_uuid:
-            if self.as_uuid:
+    class IRISUniqueIdentifier(sqltypes.Uuid):
+        def literal_processor(self, dialect):
+            if not self.as_uuid:
 
                 def process(value):
-                    if value is not None:
-                        value = str(value)
-                    return value
+                    return f"""'{value.replace("'", "''")}'"""
 
                 return process
             else:
 
                 def process(value):
-                    return value
+                    return f"""'{str(value).replace("'", "''")}'"""
 
                 return process
-        else:
-            return None
 
-    def result_processor(self, dialect, coltype):
-        character_based_uuid = not dialect.supports_native_uuid or not self.native_uuid
+        def bind_processor(self, dialect):
+            character_based_uuid = (
+                not dialect.supports_native_uuid or not self.native_uuid
+            )
 
-        if character_based_uuid:
-            if self.as_uuid:
+            if character_based_uuid:
+                if self.as_uuid:
 
-                def process(value):
-                    if value and not isinstance(value, _python_UUID):
-                        value = _python_UUID(value)
-                    return value
+                    def process(value):
+                        if value is not None:
+                            value = str(value)
+                        return value
 
-                return process
+                    return process
+                else:
+
+                    def process(value):
+                        return value
+
+                    return process
             else:
+                return None
 
-                def process(value):
-                    if value and isinstance(value, _python_UUID):
-                        value = str(value)
-                    return value
+        def result_processor(self, dialect, coltype):
+            character_based_uuid = (
+                not dialect.supports_native_uuid or not self.native_uuid
+            )
 
-                return process
-        else:
-            if not self.as_uuid:
+            if character_based_uuid:
+                if self.as_uuid:
 
-                def process(value):
-                    if value and isinstance(value, _python_UUID):
-                        value = str(value)
-                    return value
+                    def process(value):
+                        if value and not isinstance(value, _python_UUID):
+                            value = _python_UUID(value)
+                        return value
 
-                return process
+                    return process
+                else:
+
+                    def process(value):
+                        if value and isinstance(value, _python_UUID):
+                            value = str(value)
+                        return value
+
+                    return process
             else:
-                return None
+                if not self.as_uuid:
+
+                    def process(value):
+                        if value and isinstance(value, _python_UUID):
+                            value = str(value)
+                        return value
+
+                    return process
+                else:
+                    return None
 
 
 class IRISListBuild(UserDefinedType):
@@ -267,9 +274,7 @@ class IRISVector(UserDefinedType):
         item_type_server = (
             "decimal"
             if self.item_type is float
-            else "float"
-            if self.item_type is Decimal
-            else "int"
+            else "float" if self.item_type is Decimal else "int"
         )
         self.item_type_server = item_type_server
 
@@ -304,19 +309,21 @@ class IRISVector(UserDefinedType):
         #     return self.func('vector_l2', other)
 
         def max_inner_product(self, other):
-            return self.func('vector_dot_product', other)
+            return self.func("vector_dot_product", other)
 
         def cosine_distance(self, other):
-            return self.func('vector_cosine', other)
+            return self.func("vector_cosine", other)
 
         def cosine(self, other):
-            return (1 - self.func('vector_cosine', other))
+            return 1 - self.func("vector_cosine", other)
 
         def func(self, funcname: str, other):
             if not isinstance(other, list) and not isinstance(other, tuple):
                 raise ValueError("expected list or tuple, got '%s'" % type(other))
             othervalue = f"[{','.join([str(v) for v in other])}]"
-            return getattr(func, funcname)(self, func.to_vector(othervalue, text(self.type.item_type_server)))
+            return getattr(func, funcname)(
+                self, func.to_vector(othervalue, text(self.type.item_type_server))
+            )
 
 
 class BIT(sqltypes.TypeEngine):

{sqlalchemy_iris-0.13.4b4.dist-info → sqlalchemy_iris-0.14.1b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-iris
-Version: 0.13.4b4
+Version: 0.14.1b1
 Summary: InterSystems IRIS for SQLAlchemy
 Home-page: https://github.com/caretdev/sqlalchemy-iris
 Maintainer: CaretDev

{sqlalchemy_iris-0.13.4b4.dist-info → sqlalchemy_iris-0.14.1b1.dist-info}/RECORD

@@ -69,17 +69,17 @@ irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
 sqlalchemy_iris/__init__.py,sha256=2bckDQ0AJJ9DfuAc20VVQNiK-YBhpYJMdo_C0qJwPHQ,1183
 sqlalchemy_iris/alembic.py,sha256=IhZP6P-whMrXzD8lTCKvIC6EK8hKW88JTNG_U8t2quk,6373
-sqlalchemy_iris/base.py,sha256=9wOUP5ebYYDPDuAsZ-ifaz1Jy9yRV7mbXnQRhe-9QD0,52309
+sqlalchemy_iris/base.py,sha256=4YkWnDZ3TKh6URgswDYn1EHSY7Y9W54fi91nQiWwoAM,52363
 sqlalchemy_iris/embedded.py,sha256=5WZ78PIYB_pPyaLrK4E7kHUsGBRiwzYHjsTDiNYHUGg,819
 sqlalchemy_iris/information_schema.py,sha256=Ei1gAHXn4fWpvmUzwf-2hGslU458uQXFt1s0r1NAj2Y,6132
 sqlalchemy_iris/iris.py,sha256=Of0Ruc9W2c5ll5sjAy1xRo4tf1m0l_ab0vAdacTv3Yw,276
 sqlalchemy_iris/irisasync.py,sha256=7Kmso-RGjxQi9Y4x-zQaUk1ylDQ7TDvpvlZh_syJtGw,312
 sqlalchemy_iris/provision.py,sha256=drorbIgNO770Ws0XiCRXY_sDbQGIy2_zzNK3KYrDetY,198
 sqlalchemy_iris/requirements.py,sha256=2MPADPOk3qvXCyr7xXvkl_MfkE8v75Z3yGJO0RbzRog,7560
-sqlalchemy_iris/types.py,sha256=LXqinhEgJXMeBvQ70_lTntK0QROXfTapRdKmaic3aMc,10626
-sqlalchemy_iris-0.13.4b4.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
-sqlalchemy_iris-0.13.4b4.dist-info/METADATA,sha256=05y34ulcyrno8h0sYlRbVfT1fY3Zb0CVyAYym7mtzlQ,2357
-sqlalchemy_iris-0.13.4b4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sqlalchemy_iris-0.13.4b4.dist-info/entry_points.txt,sha256=zjOwyJPXHsNAeQP0n6l2_pav2U__rTAiS_Bk_IEmSlU,184
-sqlalchemy_iris-0.13.4b4.dist-info/top_level.txt,sha256=mjpHqFjekbB1TWr3xI3o4AqN3Spby-_uqyuSSeBDmuw,50
-sqlalchemy_iris-0.13.4b4.dist-info/RECORD,,
+sqlalchemy_iris/types.py,sha256=Bp2hM7HTbO6DguN7Ua4eTl2thY3SZZKiV7JG_VUItwg,10981
+sqlalchemy_iris-0.14.1b1.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
+sqlalchemy_iris-0.14.1b1.dist-info/METADATA,sha256=hw7PjnmQMAEaSLmqWd6iBzHqjm7aP00vcJ2WYOrGXJU,2357
+sqlalchemy_iris-0.14.1b1.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sqlalchemy_iris-0.14.1b1.dist-info/entry_points.txt,sha256=zjOwyJPXHsNAeQP0n6l2_pav2U__rTAiS_Bk_IEmSlU,184
+sqlalchemy_iris-0.14.1b1.dist-info/top_level.txt,sha256=mjpHqFjekbB1TWr3xI3o4AqN3Spby-_uqyuSSeBDmuw,50
+sqlalchemy_iris-0.14.1b1.dist-info/RECORD,,

{sqlalchemy_iris-0.13.4b4.dist-info → sqlalchemy_iris-0.14.1b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any