sqlalchemy-iris 0.15.3b2__py3-none-any.whl → 0.15.4__py3-none-any.whl

iris/__init__.py

@@ -1,6 +1,9 @@
-from sys import path as __syspath
 import os
+import sys
+import importlib
+
 from .iris_ipm import ipm
+from .iris_utils import update_dynalib_path
 
 # check for install dir in environment
 # environment to check is IRISINSTALLDIR
@@ -11,15 +14,45 @@ if installdir is None:
         raise Exception("""Cannot find InterSystems IRIS installation directory
     Please set IRISINSTALLDIR environment variable to the InterSystems IRIS installation directory""")
 
+__sysversion_info = sys.version_info
+__syspath = sys.path
+__osname = os.name
+
 # join the install dir with the bin directory
 __syspath.append(os.path.join(installdir, 'bin'))
 # also append lib/python
 __syspath.append(os.path.join(installdir, 'lib', 'python'))
 
+# update the dynalib path
+update_dynalib_path(os.path.join(installdir, 'bin'))
+
 # save working directory
 __ospath = os.getcwd()
 
-from pythonint import *
+__irispythonint = None
+
+if __osname=='nt':
+    if __sysversion_info.minor==9:
+        __irispythonint = 'pythonint39'
+    elif __sysversion_info.minor==10:
+        __irispythonint = 'pythonint310'
+    elif __sysversion_info.minor==11:
+        __irispythonint = 'pythonint311'
+    elif __sysversion_info.minor==12:
+        __irispythonint = 'pythonint312'
+    elif __sysversion_info.minor==13:
+        __irispythonint = 'pythonint313'
+else:
+    __irispythonint = 'pythonint'
+
+if __irispythonint is not None:
+    # equivalent to from pythonint import *
+    try:
+        __irispythonintmodule = importlib.import_module(__irispythonint)
+    except ImportError:
+        __irispythonint = 'pythonint'
+        __irispythonintmodule = importlib.import_module(__irispythonint)
+    globals().update(vars(__irispythonintmodule))
 
 # restore working directory
 os.chdir(__ospath)
@@ -31,30 +64,3 @@ os.chdir(__ospath)
 #
 # End-of-file
 #
-
-def __getattr__(name):
-    try:
-        return globals()[name]
-    except KeyError:
-        return __get_iris_object__(name)
- 
-def __get_iris_object__(name:str):
-    try:
-        # replace '_' with '%'
-        name = name.replace('_', '%')
-        return cls(name)
-    except RuntimeError:
-        return __get_iris_package__(name)
- 
-def __get_iris_package__(name:str):
-    return IrisPackage(name)
- 
-class IrisPackage:
-    def __init__(self, name:str):
-        self.name = name
- 
-    def __getattr__(self, name):
-        try:
-            return globals()[f"{self.name}.{name}"]
-        except KeyError:
-            return __get_iris_object__(f"{self.name}.{name}")

iris/_cli.py

@@ -0,0 +1,75 @@
+import os
+import sys
+import argparse
+import logging
+
+from . import iris_utils
+import iris
+
+logging.basicConfig(level=logging.INFO)
+
+VENV_BACKUP_GREF = "^Venv.BackUp"
+
+def bind():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--namespace", default="")
+    args = parser.parse_args()
+
+    iris_gref = iris.gref(VENV_BACKUP_GREF)
+
+    path = ""
+
+    libpython = iris_utils.find_libpython()
+    if not libpython:
+        logging.error("libpython not found")
+        raise RuntimeError("libpython not found")
+
+    iris.system.Process.SetNamespace("%SYS")
+
+    config = iris.cls("Config.config").Open()
+
+    # Set the new libpython path
+    iris_gref["PythonRuntimeLibrary"] = config.PythonRuntimeLibrary
+        
+    config.PythonRuntimeLibrary = libpython
+
+    if "VIRTUAL_ENV" in os.environ:
+        # we are not in a virtual environment
+        path = os.path.join(os.environ["VIRTUAL_ENV"], "lib", "python" + sys.version[:4], "site-packages")
+
+    iris_gref["PythonPath"] = config.PythonPath
+
+    config.PythonPath = path
+    
+    config._Save()
+
+    log_config_changes(libpython, path)
+
+def unbind():
+    iris.system.Process.SetNamespace("%SYS")
+    config = iris.cls("Config.config").Open()
+
+    iris_gref = iris.gref(VENV_BACKUP_GREF)
+
+    if iris_gref["PythonRuntimeLibrary"]:
+        config.PythonRuntimeLibrary = iris_gref["PythonRuntimeLibrary"]
+    else:
+        config.PythonRuntimeLibrary = ""
+
+    if iris_gref["PythonPath"]:
+        config.PythonPath = iris_gref["PythonPath"]
+    else:
+        config.PythonPath = ""
+
+    config._Save()
+
+    del iris_gref["PythonRuntimeLibrary"]
+    del iris_gref["PythonPath"]
+    del iris_gref[None]
+
+    log_config_changes(config.PythonRuntimeLibrary, config.PythonPath)
+
+def log_config_changes(libpython, path):
+    logging.info("PythonRuntimeLibrary path set to %s", libpython)
+    logging.info("PythonPath set to %s", path)
+    logging.info("To iris instance %s", iris.cls("%SYS.System").GetUniqueInstanceName())

iris/iris_utils.py

@@ -0,0 +1,336 @@
+"""
+Locate libpython associated with this Python executable.
+"""
+
+# License
+#
+# Copyright 2018, Takafumi Arakaki
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+from __future__ import print_function, absolute_import
+
+from logging import getLogger
+import ctypes.util
+import functools
+import os
+import sys
+import sysconfig
+import re
+
+logger = getLogger("find_libpython")
+
+is_windows = os.name == "nt"
+is_apple = sys.platform == "darwin"
+
+SHLIB_SUFFIX = sysconfig.get_config_var("SHLIB_SUFFIX")
+if SHLIB_SUFFIX is None:
+    if is_windows:
+        SHLIB_SUFFIX = ".dll"
+    else:
+        SHLIB_SUFFIX = ".so"
+if is_apple:
+    # sysconfig.get_config_var("SHLIB_SUFFIX") can be ".so" in macOS.
+    # Let's not use the value from sysconfig.
+    SHLIB_SUFFIX = ".dylib"
+
+
+def linked_libpython():
+    """
+    Find the linked libpython using dladdr (in *nix).
+
+    Calling this in Windows always return `None` at the moment.
+
+    Returns
+    -------
+    path : str or None
+        A path to linked libpython.  Return `None` if statically linked.
+    """
+    if is_windows:
+        return None
+    return _linked_libpython_unix()
+
+
+class Dl_info(ctypes.Structure):
+    _fields_ = [
+        ("dli_fname", ctypes.c_char_p),
+        ("dli_fbase", ctypes.c_void_p),
+        ("dli_sname", ctypes.c_char_p),
+        ("dli_saddr", ctypes.c_void_p),
+    ]
+
+
+def _linked_libpython_unix():
+    libdl = ctypes.CDLL(ctypes.util.find_library("dl"))
+    libdl.dladdr.argtypes = [ctypes.c_void_p, ctypes.POINTER(Dl_info)]
+    libdl.dladdr.restype = ctypes.c_int
+
+    dlinfo = Dl_info()
+    retcode = libdl.dladdr(
+        ctypes.cast(ctypes.pythonapi.Py_GetVersion, ctypes.c_void_p),
+        ctypes.pointer(dlinfo))
+    if retcode == 0:  # means error
+        return None
+    path = os.path.realpath(dlinfo.dli_fname.decode())
+    if path == os.path.realpath(sys.executable):
+        return None
+    return path
+
+
+def library_name(name, suffix=SHLIB_SUFFIX, is_windows=is_windows):
+    """
+    Convert a file basename `name` to a library name (no "lib" and ".so" etc.)
+
+    >>> library_name("libpython3.7m.so")                   # doctest: +SKIP
+    'python3.7m'
+    >>> library_name("libpython3.7m.so", suffix=".so", is_windows=False)
+    'python3.7m'
+    >>> library_name("libpython3.7m.dylib", suffix=".dylib", is_windows=False)
+    'python3.7m'
+    >>> library_name("python37.dll", suffix=".dll", is_windows=True)
+    'python37'
+    """
+    if not is_windows and name.startswith("lib"):
+        name = name[len("lib"):]
+    if suffix and name.endswith(suffix):
+        name = name[:-len(suffix)]
+    return name
+
+
+def append_truthy(list, item):
+    if item:
+        list.append(item)
+
+
+def uniquifying(items):
+    """
+    Yield items while excluding the duplicates and preserving the order.
+
+    >>> list(uniquifying([1, 2, 1, 2, 3]))
+    [1, 2, 3]
+    """
+    seen = set()
+    for x in items:
+        if x not in seen:
+            yield x
+        seen.add(x)
+
+
+def uniquified(func):
+    """ Wrap iterator returned from `func` by `uniquifying`. """
+    @functools.wraps(func)
+    def wrapper(*args, **kwds):
+        return uniquifying(func(*args, **kwds))
+    return wrapper
+
+
+@uniquified
+def candidate_names(suffix=SHLIB_SUFFIX):
+    """
+    Iterate over candidate file names of libpython.
+
+    Yields
+    ------
+    name : str
+        Candidate name libpython.
+    """
+    LDLIBRARY = sysconfig.get_config_var("LDLIBRARY")
+    if LDLIBRARY:
+        yield LDLIBRARY
+
+    LIBRARY = sysconfig.get_config_var("LIBRARY")
+    if LIBRARY:
+        yield os.path.splitext(LIBRARY)[0] + suffix
+
+    dlprefix = "" if is_windows else "lib"
+    sysdata = dict(
+        v=sys.version_info,
+        # VERSION is X.Y in Linux/macOS and XY in Windows:
+        VERSION=(sysconfig.get_config_var("VERSION") or
+                 "{v.major}.{v.minor}".format(v=sys.version_info)),
+        ABIFLAGS=(sysconfig.get_config_var("ABIFLAGS") or
+                  sysconfig.get_config_var("abiflags") or ""),
+    )
+
+    for stem in [
+            "python{VERSION}{ABIFLAGS}".format(**sysdata),
+            "python{VERSION}".format(**sysdata),
+            "python{v.major}".format(**sysdata),
+            "python",
+            ]:
+        yield dlprefix + stem + suffix
+
+
+
+@uniquified
+def candidate_paths(suffix=SHLIB_SUFFIX):
+    """
+    Iterate over candidate paths of libpython.
+
+    Yields
+    ------
+    path : str or None
+        Candidate path to libpython.  The path may not be a fullpath
+        and may not exist.
+    """
+
+    yield linked_libpython()
+
+    # List candidates for directories in which libpython may exist
+    lib_dirs = []
+    append_truthy(lib_dirs, sysconfig.get_config_var('LIBPL'))
+    append_truthy(lib_dirs, sysconfig.get_config_var('srcdir'))
+    append_truthy(lib_dirs, sysconfig.get_config_var("LIBDIR"))
+
+    # LIBPL seems to be the right config_var to use.  It is the one
+    # used in python-config when shared library is not enabled:
+    # https://github.com/python/cpython/blob/v3.7.0/Misc/python-config.in#L55-L57
+    #
+    # But we try other places just in case.
+
+    if is_windows:
+        lib_dirs.append(os.path.join(os.path.dirname(sys.executable)))
+    else:
+        lib_dirs.append(os.path.join(
+            os.path.dirname(os.path.dirname(sys.executable)),
+            "lib"))
+
+    # For macOS:
+    append_truthy(lib_dirs, sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))
+
+    lib_dirs.append(sys.exec_prefix)
+    lib_dirs.append(os.path.join(sys.exec_prefix, "lib"))
+
+    lib_basenames = list(candidate_names(suffix=suffix))
+
+    for directory in lib_dirs:
+        for basename in lib_basenames:
+            yield os.path.join(directory, basename)
+
+    # In macOS and Windows, ctypes.util.find_library returns a full path:
+    for basename in lib_basenames:
+        yield ctypes.util.find_library(library_name(basename))
+
+# Possibly useful links:
+# * https://packages.ubuntu.com/bionic/amd64/libpython3.6/filelist
+# * https://github.com/Valloric/ycmd/issues/518
+# * https://github.com/Valloric/ycmd/pull/519
+
+
+def normalize_path(path, suffix=SHLIB_SUFFIX, is_apple=is_apple):
+    """
+    Normalize shared library `path` to a real path.
+
+    If `path` is not a full path, `None` is returned.  If `path` does
+    not exists, append `SHLIB_SUFFIX` and check if it exists.
+    Finally, the path is canonicalized by following the symlinks.
+
+    Parameters
+    ----------
+    path : str ot None
+        A candidate path to a shared library.
+    """
+    if not path:
+        return None
+    if not os.path.isabs(path):
+        return None
+    if os.path.exists(path):
+        return os.path.realpath(path)
+    if os.path.exists(path + suffix):
+        return os.path.realpath(path + suffix)
+    if is_apple:
+        return normalize_path(_remove_suffix_apple(path),
+                              suffix=".so", is_apple=False)
+    return None
+
+
+def _remove_suffix_apple(path):
+    """
+    Strip off .so or .dylib.
+
+    >>> _remove_suffix_apple("libpython.so")
+    'libpython'
+    >>> _remove_suffix_apple("libpython.dylib")
+    'libpython'
+    >>> _remove_suffix_apple("libpython3.7")
+    'libpython3.7'
+    """
+    if path.endswith(".dylib"):
+        return path[:-len(".dylib")]
+    if path.endswith(".so"):
+        return path[:-len(".so")]
+    return path
+
+
+@uniquified
+def finding_libpython():
+    """
+    Iterate over existing libpython paths.
+
+    The first item is likely to be the best one.
+
+    Yields
+    ------
+    path : str
+        Existing path to a libpython.
+    """
+    logger.debug("is_windows = %s", is_windows)
+    logger.debug("is_apple = %s", is_apple)
+    for path in candidate_paths():
+        logger.debug("Candidate: %s", path)
+        normalized = normalize_path(path)
+        if normalized:
+            logger.debug("Found: %s", normalized)
+            yield normalized
+        else:
+            logger.debug("Not found.")
+
+
+def find_libpython():
+    """
+    Return a path (`str`) to libpython or `None` if not found.
+
+    Parameters
+    ----------
+    path : str or None
+        Existing path to the (supposedly) correct libpython.
+    """
+    for path in finding_libpython():
+        return os.path.realpath(path)
+
+def update_dynalib_path(dynalib_path):
+    # Determine the environment variable based on the operating system
+    env_var = 'PATH'
+    if not sys.platform.startswith('win'):
+        if sys.platform == 'darwin':
+            env_var = 'DYLD_LIBRARY_PATH'
+        else:
+            env_var = 'LD_LIBRARY_PATH'
+            
+    # Get the current value of the environment variable
+    current_paths = os.environ.get(env_var, '')
+    
+    # Update the environment variable by appending the dynalib path
+    # Note: You can prepend instead by reversing the order in the join
+    new_paths = f"{current_paths}:{dynalib_path}" if current_paths else dynalib_path
+    
+    # Update the environment variable
+    os.environ[env_var] = new_paths
+

sqlalchemy_iris/types.py

@@ -58,7 +58,7 @@ class IRISDate(sqltypes.Date):
 
 
 class IRISTimeStamp(sqltypes.DateTime):
-    __visit_name__ = "timestamp"
+    __visit_name__ = "TIMESTAMP"
 
     def bind_processor(self, dialect):
         def process(value: datetime.datetime):
@@ -86,7 +86,7 @@ class IRISTimeStamp(sqltypes.DateTime):
 
 
 class IRISDateTime(sqltypes.DateTime):
-    __visit_name__ = "datetime"
+    __visit_name__ = "DATETIME"
 
     def bind_processor(self, dialect):
         def process(value):
@@ -110,7 +110,7 @@ class IRISDateTime(sqltypes.DateTime):
 
 
 class IRISTime(sqltypes.DateTime):
-    __visit_name__ = "time"
+    __visit_name__ = "TIME"
 
     def bind_processor(self, dialect):
         def process(value):

{sqlalchemy_iris-0.15.3b2.dist-info → sqlalchemy_iris-0.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-iris
-Version: 0.15.3b2
+Version: 0.15.4
 Summary: InterSystems IRIS for SQLAlchemy
 Home-page: https://github.com/caretdev/sqlalchemy-iris
 Maintainer: CaretDev
@@ -22,7 +22,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: SQLAlchemy >=1.3
+Requires-Dist: SQLAlchemy>=1.3
 
 sqlalchemy-iris
 ===

{sqlalchemy_iris-0.15.3b2.dist-info → sqlalchemy_iris-0.15.4.dist-info}/RECORD

@@ -61,10 +61,12 @@ intersystems_iris/pex/_InboundAdapter.py,sha256=gZlWl7afumamkj8pNbpLyKFSzhaTAiAX
 intersystems_iris/pex/_Message.py,sha256=Ugaa_lsEYke__pI5kdC7phAuyPQ7rxXUcROJL4cUxVQ,320
 intersystems_iris/pex/_OutboundAdapter.py,sha256=ao2Ubbta2DcrQGdzDUD_j1Zsk8bvUfcZNKTZkzPTNBU,1628
 intersystems_iris/pex/__init__.py,sha256=l_I1dpnluWawbFrGMDC0GLHpuHwjbpd-nho8otFX6TE,1379
-iris/__init__.py,sha256=QcMbcm3nmNwDGguQGSjcgHksOVf0qtS0MZFZbcRoxE4,1711
+iris/__init__.py,sha256=i0PK20mjoWOnFPQM0pHF8wMjjmh-5i1xLEduy4r-q9o,2036
 iris/__init__.pyi,sha256=HPv6Lot6yZt8XXj3Rb0CrVO9ChDbKVpE3ID1SIqAlwU,9766
+iris/_cli.py,sha256=HsmaY22h2a9EofCLcm_CU-ZikQNqFPDlH5xDvLon-Ko,1983
 iris/iris_ipm.py,sha256=Q0jcNItjywlqOPZr0hgdTFSeLPNEmB-tcICOI_cXnaY,790
 iris/iris_ipm.pyi,sha256=j7CNUZcjeDu5sgeWUZJO_Qi4vQmHh6aD-jPWv8OdoUs,374
+iris/iris_utils.py,sha256=kg80O3yRpHIutM-mCyr4xCeTvKWPE-Kai-b6Dxw4vQ4,9882
 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
@@ -76,10 +78,10 @@ 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=VUt2iiZms8sJiee6hY_L8FLM5UeOgN3zNFMms-gOpN4,11077
-sqlalchemy_iris-0.15.3b2.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
-sqlalchemy_iris-0.15.3b2.dist-info/METADATA,sha256=F4pVi9vuUcZomLV9Rbc9KdWb4O9fhjNg5aArjFTczZM,2357
-sqlalchemy_iris-0.15.3b2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-sqlalchemy_iris-0.15.3b2.dist-info/entry_points.txt,sha256=zjOwyJPXHsNAeQP0n6l2_pav2U__rTAiS_Bk_IEmSlU,184
-sqlalchemy_iris-0.15.3b2.dist-info/top_level.txt,sha256=mjpHqFjekbB1TWr3xI3o4AqN3Spby-_uqyuSSeBDmuw,50
-sqlalchemy_iris-0.15.3b2.dist-info/RECORD,,
+sqlalchemy_iris/types.py,sha256=mtm5wQQuA4pE6WB4EUHzAcpdBCLfZKHrY9qOcdllc7E,11077
+sqlalchemy_iris-0.15.4.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
+sqlalchemy_iris-0.15.4.dist-info/METADATA,sha256=QaOh8RoJtz0j3ztbxAS5NPTKd9ddyAHGmXrO27PtQYE,2354
+sqlalchemy_iris-0.15.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sqlalchemy_iris-0.15.4.dist-info/entry_points.txt,sha256=zjOwyJPXHsNAeQP0n6l2_pav2U__rTAiS_Bk_IEmSlU,184
+sqlalchemy_iris-0.15.4.dist-info/top_level.txt,sha256=mjpHqFjekbB1TWr3xI3o4AqN3Spby-_uqyuSSeBDmuw,50
+sqlalchemy_iris-0.15.4.dist-info/RECORD,,

{sqlalchemy_iris-0.15.3b2.dist-info → sqlalchemy_iris-0.15.4.dist-info}/WHEEL

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