python-datastore-sqlalchemy 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

{python_datastore_sqlalchemy-0.0.1.dist-info → python_datastore_sqlalchemy-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-datastore-sqlalchemy
-Version: 0.0.1
+Version: 0.0.2
 Summary: SQLAlchemy dialect for google cloud datastore
 Home-page: https://github.com/splasky/python-datastore-sqlalchemy
 Author: HY Chang(splasky)
@@ -21,6 +21,13 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy<3.0.0,>=1.4.16
+Requires-Dist: google-cloud-datastore>=2.21.0
+Requires-Dist: google-cloud-firestore>=2.21.0
+Requires-Dist: google-cloud-bigquery>=3.35.0
+Requires-Dist: google-auth>=2.40.0
+Requires-Dist: sqlglot>=28.0.0
+Requires-Dist: pandas>=2.0.0
+Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -41,14 +48,18 @@ How to install
 ```
 python3 setup.py install
 ```
+or
+```
+pip install python-datastore-sqlalchemy
+```
 How to use
 ```python
 from sqlalchemy import *
 from sqlalchemy.engine import create_engine
 from sqlalchemy.schema import *
-engine = create_engine('datastore://test-api-1', credentials='path/to/credentials.json')
+engine = create_engine("datastore://my-project/?database=my-db", credentials='path/to/credentials.json')
 conn = engine.connect()
-result = conn.execute("SELECT * from test_table)
+result = conn.execute("SELECT * fro" test_table")
 print(result.fetchall())
 ```
 

python_datastore_sqlalchemy-0.0.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+python_datastore_sqlalchemy-0.0.2.dist-info/licenses/LICENSE,sha256=vcsHP9P3NtGefy7ojTRCgi3w0QqF_igVlmFP5A47YVA,1093
+sqlalchemy_datastore/__init__.py,sha256=UmMpE_Sn41BU88qdX5KVvJPH7wMD2SufDBDQ-2cCwNQ,1239
+sqlalchemy_datastore/_helpers.py,sha256=bRvNeMz6QgJMW1M5K-dXksdnURYBZE-NIzt3tue92rg,4854
+sqlalchemy_datastore/_types.py,sha256=zs-Gr1XPP-UnppzsuWHEmD-wshkuosXM7yGeUIt-VVY,5092
+sqlalchemy_datastore/base.py,sha256=QpgQ19h9LA2h86TH14w4h_Ilg9_St76qrwD5r3Ln4bA,9322
+sqlalchemy_datastore/datastore_dbapi.py,sha256=xJVZR0Ymzj1XjB6-UeWQRHRLLYLzlOrjaYOEv3-13lY,94404
+sqlalchemy_datastore/parse_url.py,sha256=sTeNqBm-V4Dec97R4K264qvG05aUXG7iNFyKNCNkPJ8,10058
+python_datastore_sqlalchemy-0.0.2.dist-info/METADATA,sha256=zQgLqKvD-e8nqx-WLy2wGXhDjcOFiUD5ibrASBsXZbs,2471
+python_datastore_sqlalchemy-0.0.2.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+python_datastore_sqlalchemy-0.0.2.dist-info/entry_points.txt,sha256=h54O-P7HFeCKpoeQ-XSSyP_GVZ1FRAY3gFCS5lkDBIs,77
+python_datastore_sqlalchemy-0.0.2.dist-info/top_level.txt,sha256=SE6uZfiwIQaJ1RDBfMm37dm7ZIZoqDcwQ1fDm32x0Rg,21
+python_datastore_sqlalchemy-0.0.2.dist-info/RECORD,,

{python_datastore_sqlalchemy-0.0.1.dist-info → python_datastore_sqlalchemy-0.0.2.dist-info}/WHEEL

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

sqlalchemy_datastore/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2025 hychang <hychang.1997.tw@gmail.com> 
+# Copyright (c) 2025 hychang <hychang.1997.tw@gmail.com>
 #
 # 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
@@ -19,7 +19,7 @@
 
 from .base import CloudDatastoreDialect
 
-__version__ = "0.0.1"
+__version__ = "0.0.2"
 
 __all__ = [
     "__version__",

sqlalchemy_datastore/_helpers.py

@@ -60,21 +60,23 @@ def create_datastore_client(
     user_agent: Optional[client_info.ClientInfo] = None,
     database: Optional[str] = None
 ) -> Tuple[datastore.Client, Optional[Credentials]]:
-    """Construct a BigQuery client object.
+    """Construct a Datastore client object.
 
     Args:
-        credentials_info Optional[dict]:
-        credentials_path Optional[str]:
-        credentials_base64 Optional[str]:
-        location (Optional[str]):
-            Default location for jobs / datasets / tables.
+        credentials_info (Optional[dict]):
+            Service account info dictionary.
+        credentials_path (Optional[str]):
+            Path to a service account JSON key file.
+        credentials_base64 (Optional[str]):
+            Base64-encoded service account JSON key.
         project_id (Optional[str]):
             Project ID for the project which the client acts on behalf of.
         user_agent (Optional[google.api_core.client_info.ClientInfo]):
             The client info used to send a user-agent string along with API
-            requests. If ``None``, then default info will be used. Generally,
-            you only need to set this if you're developing your own library
-            or partner tool.
+            requests. If ``None``, then default info will be used.
+        database (Optional[str]):
+            Datastore database ID. ``None`` or ``"(default)"`` uses the
+            default database.
     """
 
     default_project = None

sqlalchemy_datastore/base.py

@@ -17,20 +17,15 @@
 # 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.
 import logging
-from concurrent import futures
 from typing import Any, List, Optional
 
 from google.cloud import firestore_admin_v1
-from google.cloud.firestore_admin_v1.types import Database
 from google.oauth2 import service_account
 from sqlalchemy import exc
 from sqlalchemy.engine import Connection, default
 from sqlalchemy.engine.interfaces import (
-    # DBAPICursor,
-    # _DBAPISingleExecuteParams,
     ExecutionContext,
 )
-from sqlalchemy.sql import Select
 
 from . import _types, datastore_dbapi
 from ._helpers import create_datastore_client
@@ -88,6 +83,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
         self.location = location
         self.identifier_preparer = self.preparer(self)
         self.dataset_id = None
+        self.database_id = None
         self.list_tables_page_size = list_tables_page_size
         self._client = None
 
@@ -129,6 +125,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
             provided_job_config,
             list_tables_page_size,
             user_supplied_client,
+            database_id,
         ) = parse_url(url)
 
         self.arraysize = arraysize or self.arraysize
@@ -138,6 +135,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
         self.credentials_path = credentials_path
         self.credentials_base64 = credentials_base64 or self.credentials_base64
         self.dataset_id = dataset_id
+        self.database_id = database_id
         self.billing_project_id = self.billing_project_id or self.project_id
 
         if user_supplied_client:
@@ -148,7 +146,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
                 credentials_info=self.credentials_info,
                 credentials_base64=self.credentials_base64,
                 project_id=self.billing_project_id,
-                database=None,
+                database=self.database_id,
             )
             self.project_id = self.project_id if self.project_id else client.project
             self.billing_project_id = (
@@ -162,10 +160,10 @@ class CloudDatastoreDialect(default.DefaultDialect):
 
         self._client = client
         self.credentials = credentials
-        setattr(self._client, "credentials_path", self.credentials_path)
-        setattr(self._client, "credentials_info", self.credentials_info)
-        setattr(self._client, "credentials_base64", self.credentials_base64)
-        setattr(self._client, "scoped_credentials", credentials)
+        self._client.credentials_path = self.credentials_path
+        self._client.credentials_info = self.credentials_info
+        self._client.credentials_base64 = self.credentials_base64
+        self._client.scoped_credentials = credentials
         return ([], {"client": client})
 
     def get_schema_names(self, connection: Connection, **kw) -> List[str]:
@@ -182,18 +180,11 @@ class CloudDatastoreDialect(default.DefaultDialect):
 
         try:
             list_database_resp = client.list_databases(parent=parent)
-
-            def get_database_short_name(database: Database) -> Optional[List[str]]:
-                full_name = database.name
-                if full_name:
-                    return full_name.split("/")[-1]
-                return None
-
-            with futures.ThreadPoolExecutor() as executor:
-                schemas = list(
-                    executor.map(get_database_short_name, list_database_resp.databases)
-                )
-
+            schemas = [
+                full_name.split("/")[-1]
+                for db in list_database_resp.databases
+                if (full_name := db.name)
+            ]
             return schemas
         except Exception as e:
             logging.error(e)
@@ -206,57 +197,34 @@ class CloudDatastoreDialect(default.DefaultDialect):
         query = client.query(kind="__kind__")
         kinds = list(query.fetch())
 
-        def get_kind_name(kind):
-            return (
-                name
-                if (name := getattr(getattr(kind, "key", None), "name", None))
-                is not None
-                and isinstance(name, str)
-                and not name.startswith("__")
-                else None
-            )
-
-        with futures.ThreadPoolExecutor() as executor:
-            result = list(executor.map(get_kind_name, kinds))
-
-        return [t for t in result if t is not None]
+        return [
+            name
+            for kind in kinds
+            if (name := getattr(getattr(kind, "key", None), "name", None))
+            is not None
+            and isinstance(name, str)
+            and not name.startswith("__")
+        ]
 
     def get_columns(
         self, connection: Connection, table_name: str, schema: str | None = None, **kw
     ):
-        """Retrieve column information from the database with optimized parallel processing."""
+        """Retrieve column information from the database."""
         client = self._client
         query = client.query(kind="__Stat_PropertyType_PropertyName_Kind__")
         query.add_filter("kind_name", "=", table_name)
         properties = list(query.fetch())
 
-        def process_property(property):
-            return {
-                "name": property["property_name"],
-                "type": _types._property_type[property["property_type"]],
+        return [
+            {
+                "name": prop["property_name"],
+                "type": _types._property_type[prop["property_type"]],
                 "nullable": True,
                 "comment": "",
                 "default": None,
             }
-
-        with futures.ThreadPoolExecutor() as executor:
-            columns = list(executor.map(process_property, properties))
-        return columns
-
-    def _contains_select_subquery(self, node) -> bool:
-        """
-        Check the AST node contains select subquery
-        """
-        if isinstance(node, Select):
-            for child in node.get_children():
-                if isinstance(child, Select) or self._contains_select_subquery(child):
-                    return True
-
-        for child in node.get_children():
-            if isinstance(child, Select) or self._contains_select_subquery(child):
-                return True
-
-        return False
+            for prop in properties
+        ]
 
     def do_execute(
         self,

sqlalchemy_datastore/datastore_dbapi.py

@@ -228,7 +228,7 @@ class Cursor:
 
         except Exception as e:
             logging.error(f"INSERT failed: {e}")
-            raise ProgrammingError(f"INSERT failed: {e}")
+            raise ProgrammingError(f"INSERT failed: {e}") from e
 
     def _execute_update(self, statement: str, parameters=None):
         """Execute an UPDATE statement using Datastore client."""
@@ -454,6 +454,8 @@ class Cursor:
             r"\bCOUNT_UP_TO\s*\(",
             r"\bSUM\s*\(",
             r"\bAVG\s*\(",
+            r"\bMIN\s*\(",
+            r"\bMAX\s*\(",
         ]
         for pattern in agg_patterns:
             if re.search(pattern, upper):
@@ -931,9 +933,14 @@ class Cursor:
         # This is a simplified evaluator for common patterns
         try:
             return self._eval_condition(context, where_clause)
-        except Exception:
-            # If evaluation fails, include the row (fail open)
-            return True
+        except Exception as e:
+            logging.warning(
+                "Client-side WHERE evaluation failed for clause '%s': %s. "
+                "Row will be excluded (fail closed).",
+                where_clause,
+                e,
+            )
+            return False
 
     def _eval_condition(self, context: Dict[str, Any], condition: str) -> bool:
         """Evaluate a single condition or compound condition."""
@@ -1566,10 +1573,12 @@ class Cursor:
         self.description = list(agg_fields.values())
 
     def execute_orm(
-        self, statement: str, parameters=None, tokens: List[tokens.Token] = []
+        self, statement: str, parameters=None, tokens: Optional[List[tokens.Token]] = None
     ):
         if parameters is None:
             parameters = {}
+        if tokens is None:
+            tokens = []
 
         logging.debug(
             f"[DataStore DBAPI] Executing ORM query: {statement} with parameters: {parameters}"
@@ -1812,11 +1821,15 @@ class Cursor:
     def fetchall(self):
         if self._closed:
             raise Error("Cursor is closed.")
+        if self._query_rows is None:
+            raise ProgrammingError("No query has been executed.")
         return list(self._query_rows)
 
     def fetchmany(self, size=None):
         if self._closed:
             raise Error("Cursor is closed.")
+        if self._query_rows is None:
+            raise ProgrammingError("No query has been executed.")
         if size is None:
             size = self.arraysize or 1
         results = []
@@ -1830,6 +1843,8 @@ class Cursor:
     def fetchone(self):
         if self._closed:
             raise Error("Cursor is closed.")
+        if self._query_rows is None:
+            raise ProgrammingError("No query has been executed.")
         try:
             return next(self._query_rows)
         except StopIteration:

sqlalchemy_datastore/parse_url.py

@@ -72,6 +72,11 @@ def parse_url(url):  # noqa: C901
     credentials_base64 = None
     list_tables_page_size = None
     user_supplied_client = False
+    database = None
+
+    # database
+    if "database" in query:
+        database = query.pop("database")
 
     # location
     if "location" in query:
@@ -122,6 +127,7 @@ def parse_url(url):  # noqa: C901
                 QueryJobConfig(),
                 list_tables_page_size,
                 user_supplied_client,
+                database,
             )
         else:
             return (
@@ -134,6 +140,7 @@ def parse_url(url):  # noqa: C901
                 None,
                 list_tables_page_size,
                 user_supplied_client,
+                database,
             )
 
     job_config = QueryJobConfig()
@@ -284,4 +291,5 @@ def parse_url(url):  # noqa: C901
         job_config,
         list_tables_page_size,
         user_supplied_client,
+        database,
     )

python_datastore_sqlalchemy-0.0.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-python_datastore_sqlalchemy-0.0.1.dist-info/licenses/LICENSE,sha256=vcsHP9P3NtGefy7ojTRCgi3w0QqF_igVlmFP5A47YVA,1093
-sqlalchemy_datastore/__init__.py,sha256=IUWv-9bXoRdJckJOLqNpkibKLTPD5GNpeck2HZTE3wU,1240
-sqlalchemy_datastore/_helpers.py,sha256=4rtRSCBhc0WMDimIWtD7vhxl4n3k-l8DzGR8Q6DiUaw,4769
-sqlalchemy_datastore/_types.py,sha256=zs-Gr1XPP-UnppzsuWHEmD-wshkuosXM7yGeUIt-VVY,5092
-sqlalchemy_datastore/base.py,sha256=DvYYV_qrGb86x0SwWMcY5_ZHXLXxzuVZ3JPEukF0tYQ,10610
-sqlalchemy_datastore/datastore_dbapi.py,sha256=wyR2wCyCYUoksmivAgB6mDh_XMxAj-KBIiaIJ5XxRVo,93805
-sqlalchemy_datastore/parse_url.py,sha256=Q8UO-No5he1_-iozbYoIrlnwm2Aw5ePGEBjP_4U1eyM,9883
-python_datastore_sqlalchemy-0.0.1.dist-info/METADATA,sha256=W9Q5j0Z90WhVIZACeaPgWsl0zqOFj_D_LASVI3jW4So,2147
-python_datastore_sqlalchemy-0.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-python_datastore_sqlalchemy-0.0.1.dist-info/entry_points.txt,sha256=h54O-P7HFeCKpoeQ-XSSyP_GVZ1FRAY3gFCS5lkDBIs,77
-python_datastore_sqlalchemy-0.0.1.dist-info/top_level.txt,sha256=SE6uZfiwIQaJ1RDBfMm37dm7ZIZoqDcwQ1fDm32x0Rg,21
-python_datastore_sqlalchemy-0.0.1.dist-info/RECORD,,