thds.core 1.45.20251007062722__py3-none-any.whl → 1.46.20251008224105__py3-none-any.whl

thds/core/source/_construct.py

@@ -1,4 +1,5 @@
 import os
+import stat
 import sys
 import typing as ty
 from functools import partial
@@ -43,20 +44,21 @@ def from_file(
     responsibility to ensure that your file has been uploaded to the URI you provide.
     """
     path = path_from_uri(filename) if isinstance(filename, str) else Path(filename)
-    if not path.exists():
-        raise FileNotFoundError(path)
+    stats = path.stat()  # raises FileNotFoundError if file doesn't exist
+    if stat.S_ISDIR(stats.st_mode):
+        raise IsADirectoryError(path)
 
     file_hash = hash or hash_file(path)  # use automatic hash algo if not specified!
     if uri:
-        src = from_uri(uri, file_hash)
+        src = from_uri(uri, file_hash, stats.st_size)
     else:
-        src = Source(to_uri(path), file_hash)
+        src = Source(to_uri(path), file_hash, stats.st_size)
     src._set_cached_path(path)  # internally, it's okay to hack around immutability.
     return src
 
 
 class FromUri(ty.Protocol):
-    def __call__(self, hash: ty.Optional[Hash]) -> Source:
+    def __call__(self, hash: ty.Optional[Hash], size: int = 0) -> Source:
         """Closure over a URI that creates a Source from a URI.
 
         The Hash may be used to short-circuit creation that would result in creating
@@ -84,13 +86,20 @@ def register_from_uri_handler(key: str, handler: FromUriHandler):
     _FROM_URI_HANDLERS[key] = handler
 
 
+def _from_local_uri(uri: str, hash: ty.Optional[Hash], size: int = 0) -> Source:
+    """fulfill the FromUri interface"""
+    return from_file(path_from_uri(uri), hash)
+
+
+def _local_file_uri_handler(uri: str) -> ty.Optional[FromUri]:
+    return partial(_from_local_uri, uri) if is_file_uri(uri) else None
+
+
 _FROM_URI_HANDLERS: ty.Dict[str, FromUriHandler] = dict()
-register_from_uri_handler(
-    "local_file", lambda uri: partial(from_file, path_from_uri(uri)) if is_file_uri(uri) else None
-)
+register_from_uri_handler("local_file", _local_file_uri_handler)
 
 
-def from_uri(uri: str, hash: ty.Optional[Hash] = None) -> Source:
+def from_uri(uri: str, hash: ty.Optional[Hash] = None, size: int = 0) -> Source:
     """Create a read-only Source from a URI. The data should already exist at this remote
     URI, although Source itself can make no guarantee that it always represents real data
     - only that any data it does represent is read-only.
@@ -101,5 +110,5 @@ def from_uri(uri: str, hash: ty.Optional[Hash] = None) -> Source:
     """
     for handler in _FROM_URI_HANDLERS.values():
         if from_uri_ := handler(uri):
-            return from_uri_(hash)
-    return Source(uri=uri, hash=hash)
+            return from_uri_(hash, size)
+    return Source(uri=uri, hash=hash, size=size)

thds/core/source/serde.py

@@ -36,6 +36,7 @@ def from_json(json_source: str, hash_parsers: ty.Collection[HashParser] = base_p
     return _construct.from_uri(
         uri=d["uri"],
         hash=next(filter(None, (p(d) for p in hash_parsers)), None),
+        size=d.get("size") or 0,
     )
 
 
@@ -57,7 +58,7 @@ def to_json(
     hash_dict = (
         next(filter(None, (ser(source.hash) for ser in hash_serializers if source.hash)), None)
     ) or dict()
-    return json.dumps(dict(uri=source.uri, **hash_dict))
+    return json.dumps(dict(uri=source.uri, size=source.size, **hash_dict))
 
 
 def from_unknown_user_path(path: types.StrOrPath, desired_uri: str) -> Source:

thds/core/source/src.py

@@ -45,6 +45,8 @@ class Source(os.PathLike):
     hash: ty.Optional[hashing.Hash] = None
     # hash and equality are based only on the _identity_ of the object,
     # not on the other properties that provide some caching functionality.
+    size: int = 0
+    # in bytes
 
     @property
     def cached_path(self) -> ty.Optional[Path]:
@@ -95,7 +97,7 @@ class Source(os.PathLike):
         return from_file(filename, hash, uri)
 
     @staticmethod
-    def from_uri(uri: str, hash: ty.Optional[hashing.Hash] = None) -> "Source":
+    def from_uri(uri: str, hash: ty.Optional[hashing.Hash] = None, size: int = 0) -> "Source":
         from ._construct import from_uri
 
-        return from_uri(uri, hash)
+        return from_uri(uri, hash, size)

thds/core/sqlite/__init__.py

@@ -1,4 +1,4 @@
-from . import connect, copy, ddl, functions, index, read, sqlmap, upsert  # noqa: F401
+from . import connect, copy, ddl, functions, index, read, sqlmap, types, upsert  # noqa: F401
 from .merge import merge_databases  # noqa: F401
 from .meta import (  # noqa: F401
     debug_errors,

thds/core/sqlite/meta.py

@@ -37,11 +37,50 @@ def list_tables(connectable: Connectable, schema_name: str = "") -> ty.List[str]
 
 
 @autoconn_scope.bound
+def get_sql_defs_by_name(
+    connectable: Connectable, types: ty.Collection[str], *, schema_name: str = "main"
+) -> ty.Dict[str, str]:
+    conn = autoconnect(connectable)
+    return {
+        row[0]: row[1]
+        for row in conn.execute(
+            f"""
+            SELECT name, sql
+            FROM {fullname('sqlite_master', schema_name)}
+            WHERE type IN ({', '.join('?' for _ in types)})
+            AND sql is not null
+            """,
+            tuple(types),
+        )
+    }
+
+
 def get_tables(connectable: Connectable, *, schema_name: str = "main") -> ty.Dict[str, str]:
     """Keys of the returned dict are the names of tables in the database.
 
     Values of the returned dict are the raw SQL that can be used to recreate the table.
     """
+    return get_sql_defs_by_name(connectable, ["table"], schema_name=schema_name)
+
+
+def get_views(connectable: Connectable, *, schema_name: str = "main") -> ty.Dict[str, str]:
+    """Keys of the returned dict are the names of views in the database.
+
+    Values of the returned dict are the raw SQL that can be used to recreate the view.
+    """
+    return get_sql_defs_by_name(connectable, ["view"], schema_name=schema_name)
+
+
+def get_triggers(connectable: Connectable, *, schema_name: str = "main") -> dict[str, str]:
+    """Keys of the returned dict are the names of triggers in the database.
+    Values of the returned dict are the raw SQL that can be used to recreate the trigger.
+    """
+    return get_sql_defs_by_name(connectable, ["trigger"], schema_name=schema_name)
+
+
+@autoconn_scope.bound
+def get_virtual_tables(connectable: Connectable, *, schema_name: str = "main") -> dict[str, str]:
+    """Get virtual tables (FTS, etc.)."""
     conn = autoconnect(connectable)
     return {
         row[0]: row[1]
@@ -49,8 +88,7 @@ def get_tables(connectable: Connectable, *, schema_name: str = "main") -> ty.Dic
             f"""
             SELECT name, sql
             FROM {fullname('sqlite_master', schema_name)}
-            WHERE type = 'table'
-            AND sql is not null
+            WHERE type='table' AND sql LIKE 'CREATE VIRTUAL TABLE%'
             """
         )
     }

thds/core/sqlite/types.py

@@ -59,4 +59,4 @@ def maybe_t(
     return None
 
 
-Connectable = ty.Union[os.PathLike, sqlite3.Connection]
+Connectable = ty.Union[str, os.PathLike, sqlite3.Connection]

{thds_core-1.45.20251007062722.dist-info → thds_core-1.46.20251008224105.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.core
-Version: 1.45.20251007062722
+Version: 1.46.20251008224105
 Summary: Core utilities.
 Author-email: Trilliant Health <info@trillianthealth.com>
 License: MIT

{thds_core-1.45.20251007062722.dist-info → thds_core-1.46.20251008224105.dist-info}/RECORD

@@ -53,13 +53,13 @@ thds/core/log/kw_formatter.py,sha256=9-MVOd2r5NEkYNne9qWyFMeR5lac3w7mjHXsDa681i0
 thds/core/log/kw_logger.py,sha256=CyZVPnkUMtrUL2Lyk261AIEPmoP-buf_suFAhQlU1io,4063
 thds/core/log/logfmt.py,sha256=i66zoG2oERnE1P_0TVXdlfJ1YgUmvtMjqRtdV5u2SvU,10366
 thds/core/source/__init__.py,sha256=e-cRoLl1HKY3YrDjpV5p_i7zvr1L4q51-t1ISTxdig4,543
-thds/core/source/_construct.py,sha256=lt6OUOz_s9VBZMZJHXVpfIjmuTH7w1PBhpre0dlW1Zw,3914
+thds/core/source/_construct.py,sha256=jtsh0Du67TslWjCLASZ3pAMeaiowfgm7Bt50zIhwx7k,4330
 thds/core/source/_construct_tree.py,sha256=5Zk3a5a0uVxklWw6q4JOvI_bErqwlBngUz4TyEAWn1g,616
 thds/core/source/_download.py,sha256=faKWxgzw1fTqOoyjtgi4IyhiZpBYTm_GZxwqC6LTiXU,2764
-thds/core/source/serde.py,sha256=zEAR24AewgDqqkIxcPpS7NZ-ZbEnQPK_A7siWlE3Q0E,3091
-thds/core/source/src.py,sha256=nTUBgsAES0J73enIEbc5BitgnxA5kBnf88oYZoMQGnM,4596
+thds/core/source/serde.py,sha256=fCcsqER21uI41og24pDDVsksTYFIgOiz_2v3MJPpb2Y,3142
+thds/core/source/src.py,sha256=Pbe8W_M1oaWwC1UKX3JtB25h3hzSNU9aCiVSkNz32Pk,4650
 thds/core/source/tree.py,sha256=iNCoCE655MwXQwc2Y0IIm1HMVk5Inj0NGVU9U8Wl_90,4317
-thds/core/sqlite/__init__.py,sha256=tDMzuO76qTtckJHldPQ6nPZ6kcvhhoJrVuuW42JtaSQ,606
+thds/core/sqlite/__init__.py,sha256=xJbwCoIeiOvsZDc2PlkJukRKmv3fIgSny68O6lulGPw,613
 thds/core/sqlite/connect.py,sha256=l4QaSAI8RjP7Qh2FjmJ3EwRgfGf65Z3-LjtC9ocHM_U,977
 thds/core/sqlite/copy.py,sha256=y3IRQTBrWDfKuVIfW7fYuEgwRCRKHjN0rxVFkIb9VrQ,1155
 thds/core/sqlite/ddl.py,sha256=k9BvmDzb0rrlhmEpXkB6ESaZAUWtbL58x-70sPyoFk4,201
@@ -67,15 +67,15 @@ thds/core/sqlite/functions.py,sha256=AOIRzb7lNxmFm1J5JS6R8Nl-dSv3Dy47UNZVVjl1rvk
 thds/core/sqlite/index.py,sha256=Vc7qxPqQ69A6GO5gmVQf5e3y8f8IqOTHgyEDoVZxTFM,903
 thds/core/sqlite/insert_utils.py,sha256=BNI3VUdqwBdaqa0xqiJrhE6XyzPsTF8N4KKKdb4Vfes,884
 thds/core/sqlite/merge.py,sha256=NxettDMJ_mcrWfteQn_ERY7MUB5ETR-yJLKg7uvF6zA,3779
-thds/core/sqlite/meta.py,sha256=4P65PAmCjagHYO1Z6nWM-wkjEWv3hxw5qVa4cIpcH_8,5859
+thds/core/sqlite/meta.py,sha256=8Gh4FhTzU86FK8oWosoyPfT0EVd-kfieThEQBrD-l30,7299
 thds/core/sqlite/read.py,sha256=5pWvrbed3XNWgSy-79-8ONWkkt4jWbTzFNW6SnOrdYQ,2576
 thds/core/sqlite/sqlmap.py,sha256=LeyiJtY0ww_mbeSp7LQM-YuWnckulQqropxwAfkt5To,6818
 thds/core/sqlite/structured.py,sha256=8t1B6XbM5NnudKEeBLsdjRVbSXXSr6iHOW0HwEAqtXU,4818
-thds/core/sqlite/types.py,sha256=Zb1FtSAmC1L7QPPCV1eRnWpJuF74t9R293ai1SHtdS4,1292
+thds/core/sqlite/types.py,sha256=oq8m0UrvSn1IqWWcQ4FPptfAhdj6DllnCe7puVqSHlY,1297
 thds/core/sqlite/upsert.py,sha256=BmKK6fsGVedt43iY-Lp7dnAu8aJ1e9CYlPVEQR2pMj4,5827
 thds/core/sqlite/write.py,sha256=z0219vDkQDCnsV0WLvsj94keItr7H4j7Y_evbcoBrWU,3458
-thds_core-1.45.20251007062722.dist-info/METADATA,sha256=wsEC4MEoGuF97Kz9ciN_ZoglDcKbjOyOCKR4sqy-ZTE,2216
-thds_core-1.45.20251007062722.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_core-1.45.20251007062722.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
-thds_core-1.45.20251007062722.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_core-1.45.20251007062722.dist-info/RECORD,,
+thds_core-1.46.20251008224105.dist-info/METADATA,sha256=0U7El82Q5euMyobeHWCgu9R5KN7tUKRO6qeHyAA7GUw,2216
+thds_core-1.46.20251008224105.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_core-1.46.20251008224105.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
+thds_core-1.46.20251008224105.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_core-1.46.20251008224105.dist-info/RECORD,,