lesscode-database 0.0.5__tar.gz → 0.0.6__tar.gz

{lesscode_database-0.0.5 → lesscode_database-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode_database
-Version: 0.0.5
+Version: 0.0.6
 Summary: lesscode_database是数据库连接工具包
 Author: navysummer
 Author-email: navysummer@yeah.net
@@ -20,12 +20,11 @@ License-File: LICENSE
 ```python
 import asyncio
 
-from sqlalchemy import select, Column, VARCHAR, INTEGER, Table, MetaData
-from sqlalchemy.ext.asyncio import async_sessionmaker
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy import select, MetaData, Table, Column, VARCHAR, INTEGER
 
 from lesscode_database.connection_info import ConnectionInfo
 from lesscode_database.db_options import db_options
+from lesscode_database.ds_helper import DsHelper
 
 db_options.conn_list = [
     ConnectionInfo(dialect="mysql", name="mysql", host="127.0.0.1", port=3306, user="root",
@@ -66,8 +65,9 @@ db_options.conn_list = [
 
 ]
 
+
 # mysql 同步测试，async_enable=False
-with db_options.mysql.dedicated_connection() as conn:
+with DsHelper("mysql").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -78,7 +78,7 @@ with db_options.mysql.dedicated_connection() as conn:
 
 # mysql 异步测试，async_enable=True
 async def async_mysql_test():
-    async with db_options.mysql.acquire() as conn:
+    async with DsHelper("mysql").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -89,7 +89,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_mysql_test())
 
 # doris 同步测试，async_enable=False
-with db_options.doris.dedicated_connection() as conn:
+with DsHelper("doris").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -100,7 +100,7 @@ with db_options.doris.dedicated_connection() as conn:
 
 # doris 异步测试，async_enable=True
 async def async_doris_test():
-    async with db_options.doris.acquire() as conn:
+    async with DsHelper("doris").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -111,7 +111,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_doris_test())
 
 # ocean_base 同步测试，async_enable=False
-with db_options.ocean_base.dedicated_connection() as conn:
+with DsHelper("ocean_base").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -122,7 +122,7 @@ with db_options.ocean_base.dedicated_connection() as conn:
 
 # ocean_base 异步测试，async_enable=True
 async def async_ocean_base_test():
-    async with db_options.ocean_base.acquire() as conn:
+    async with DsHelper("ocean_base").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -133,7 +133,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_ocean_base_test())
 
 # tidb 同步测试，async_enable=False
-with db_options.tidb.dedicated_connection() as conn:
+with DsHelper("tidb").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -144,7 +144,7 @@ with db_options.tidb.dedicated_connection() as conn:
 
 # tidb 异步测试，async_enable=True
 async def async_tidb_test():
-    async with db_options.tidb.acquire() as conn:
+    async with DsHelper("tidb").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -157,7 +157,7 @@ loop.run_until_complete(async_tidb_test())
 
 # sqlite3 异步测试
 async def async_sqlite3_test():
-    cur = await db_options.sqlite3.cursor()
+    cur = await DsHelper("sqlite3").pool.cursor()
     await cur.execute("SELECT 1")
     row = await cur.fetchone()
     print(row)
@@ -167,7 +167,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_sqlite3_test())
 
 # sqlite3 同步测试
-cursor = db_options.sqlite3.cursor()
+cursor = DsHelper("sqlite3").pool.cursor()
 cursor.execute('select 1')
 row = cursor.fetchone()
 print(row)
@@ -181,7 +181,7 @@ body = {
     },
     "size": 1
 }
-resp = db_options.es.search(
+resp = DsHelper("es").pool.search(
     index="test",
     body=body
 )
@@ -190,7 +190,7 @@ print(resp)
 
 # es异步测试，async_enable=True
 async def async_es_test():
-    resp = await db_options.es.search(
+    resp = await DsHelper("es").pool.search(
         index="test",
         body={"query": {"match_all": {}}},
         size=1,
@@ -202,7 +202,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_es_test())
 
 # sql server同步测试
-cursor = db_options.mssql.cursor()
+cursor = DsHelper("mssql").pool.cursor()
 cursor.execute('SELECT 1')
 row = cursor.fetchone()
 print(row)
@@ -210,7 +210,7 @@ print(row)
 # sql server暂不支持异步测试
 
 # oracle 同步测试
-cursor = db_options.oracle.cursor()
+cursor = DsHelper("oracle").pool.cursor()
 cursor.execute('select 1')
 row = cursor.fetchone()
 print(row)
@@ -219,12 +219,12 @@ print(row)
 
 
 # mongo同步测试，async_enable=False
-print(db_options.mongo.test.test.find_one())
+print(DsHelper("mongo").pool.test.test.find_one())
 
 
 # mongo异步测试，async_enable=True
 async def async_mongo_test():
-    resp = await db_options.mongo.test.test.find_one()
+    resp = await DsHelper("mongo").pool.test.test.find_one()
     print(resp)
 
 
@@ -232,15 +232,16 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_mongo_test())
 
 # nebula同步测试，async_enable=False
-with db_options.nebula.session_context("root", "nebula") as session:
-    session.execute(f'USE test')
-    result = session.execute("match (t:Test) return t limit 1")
+with DsHelper("nebula").make_nebula_session() as session:
+    session.execute(f'USE core')
+    result = session.execute("match (c:Company) return c limit 1")
     print(result)
 
+print(DsHelper("nebula").exec_nebula_gql("match (c:Company) return c limit 1", "core"))
 # nebula暂不支持异步
 
 # postgresql同步测试，async_enable=False
-with db_options.postgresql.connection() as conn:
+with DsHelper("postgresql").pool.connection() as conn:
     with conn.cursor() as cursor:
         cursor.execute("select 1")
         rs = cursor.fetchone()
@@ -249,7 +250,7 @@ with db_options.postgresql.connection() as conn:
 
 # postgresql异步测试，async_enable=True
 async def async_pg_test():
-    async with db_options.postgresql.acquire() as conn:
+    async with DsHelper("postgresql").pool.acquire() as conn:
         async with conn.cursor() as cur:
             await cur.execute("select 1")
             rs = await cur.fetchone()
@@ -260,12 +261,12 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_pg_test())
 
 # redis 同步测试，async_enable=False
-print(db_options.redis.exists("test"))
+print(DsHelper("redis").pool.exists("test"))
 
 
 # redis 异步测试，async_enable=True
 async def async_redis_test():
-    rs = await db_options.redis.exists("test")
+    rs = await DsHelper("redis").pool.exists("test")
     print(rs)
 
 
@@ -279,52 +280,49 @@ t1 = Table("test_user", meta, Column("name", VARCHAR(collation='utf8mb3_bin', le
                   server_default=None))
 
 # sqlalchemy同步测试，async_enable=False
-with sessionmaker(bind=db_options.sqlalchemy)() as session:
+with DsHelper("sqlalchemy").make_sqlalchemy_session() as session:
     cur = session.execute(select(t1))
     print(cur.fetchall())
 
 
 # sqlalchemy异步测试，async_enable=True
 async def async_sqlalchemy_test():
-    async with async_sessionmaker(db_options.sqlalchemy)() as session:
+    async with DsHelper("sqlalchemy").async_make_sqlalchemy_session() as session:
         cur = await session.execute(select(t1))
-
         print(cur.fetchall())
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_sqlalchemy_test())
 
-
 # neo4j同步测试
 def query(tx):
-    nql = "MATCH (c:Company) return c limit 1"
+    nql = "match (p:Person) return p"
     for record in tx.run(nql):
         print(record)
 
 
-with db_options.neo4j.session(database="invest") as session:
+with DsHelper("neo4j").make_neo4j_session() as session:
     session.execute_read(query)
 
-
 # neo4j异步测试
 async def query(tx):
-    nql = "MATCH (c:Company) return c limit 1"
+    nql = "match (p:Person) return p"
     res = await tx.run(nql)
     async for record in res:
         print(record)
 
-
 async def async_neo4j_test():
-    async with db_options.neo4j.session(database="invest") as session:
+    async with DsHelper("neo4j").async_make_neo4j_session() as session:
         await session.execute_read(query)
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_neo4j_test())
 
+
 # clickhouse 同步测试
-with db_options.clickhouse as conn:
+with DsHelper("clickhouse").pool.dedicated_connection() as conn:
     with conn.cursor() as cursor:
         cursor.execute('SELECT 1')
         print(cursor.fetchall())
@@ -332,7 +330,7 @@ with db_options.clickhouse as conn:
 
 # clickhouse 异步测试测试
 async def async_clickhouse_test():
-    async with db_options.clickhouse.acquire() as conn:
+    async with DsHelper("clickhouse").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("SELECT 1")
             ret = await cursor.fetchone()
@@ -342,5 +340,4 @@ async def async_clickhouse_test():
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_clickhouse_test())
 
-
 ```

{lesscode_database-0.0.5 → lesscode_database-0.0.6}/README.md

@@ -7,12 +7,11 @@
 ```python
 import asyncio
 
-from sqlalchemy import select, Column, VARCHAR, INTEGER, Table, MetaData
-from sqlalchemy.ext.asyncio import async_sessionmaker
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy import select, MetaData, Table, Column, VARCHAR, INTEGER
 
 from lesscode_database.connection_info import ConnectionInfo
 from lesscode_database.db_options import db_options
+from lesscode_database.ds_helper import DsHelper
 
 db_options.conn_list = [
     ConnectionInfo(dialect="mysql", name="mysql", host="127.0.0.1", port=3306, user="root",
@@ -53,8 +52,9 @@ db_options.conn_list = [
 
 ]
 
+
 # mysql 同步测试，async_enable=False
-with db_options.mysql.dedicated_connection() as conn:
+with DsHelper("mysql").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -65,7 +65,7 @@ with db_options.mysql.dedicated_connection() as conn:
 
 # mysql 异步测试，async_enable=True
 async def async_mysql_test():
-    async with db_options.mysql.acquire() as conn:
+    async with DsHelper("mysql").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -76,7 +76,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_mysql_test())
 
 # doris 同步测试，async_enable=False
-with db_options.doris.dedicated_connection() as conn:
+with DsHelper("doris").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -87,7 +87,7 @@ with db_options.doris.dedicated_connection() as conn:
 
 # doris 异步测试，async_enable=True
 async def async_doris_test():
-    async with db_options.doris.acquire() as conn:
+    async with DsHelper("doris").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -98,7 +98,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_doris_test())
 
 # ocean_base 同步测试，async_enable=False
-with db_options.ocean_base.dedicated_connection() as conn:
+with DsHelper("ocean_base").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -109,7 +109,7 @@ with db_options.ocean_base.dedicated_connection() as conn:
 
 # ocean_base 异步测试，async_enable=True
 async def async_ocean_base_test():
-    async with db_options.ocean_base.acquire() as conn:
+    async with DsHelper("ocean_base").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -120,7 +120,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_ocean_base_test())
 
 # tidb 同步测试，async_enable=False
-with db_options.tidb.dedicated_connection() as conn:
+with DsHelper("tidb").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -131,7 +131,7 @@ with db_options.tidb.dedicated_connection() as conn:
 
 # tidb 异步测试，async_enable=True
 async def async_tidb_test():
-    async with db_options.tidb.acquire() as conn:
+    async with DsHelper("tidb").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -144,7 +144,7 @@ loop.run_until_complete(async_tidb_test())
 
 # sqlite3 异步测试
 async def async_sqlite3_test():
-    cur = await db_options.sqlite3.cursor()
+    cur = await DsHelper("sqlite3").pool.cursor()
     await cur.execute("SELECT 1")
     row = await cur.fetchone()
     print(row)
@@ -154,7 +154,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_sqlite3_test())
 
 # sqlite3 同步测试
-cursor = db_options.sqlite3.cursor()
+cursor = DsHelper("sqlite3").pool.cursor()
 cursor.execute('select 1')
 row = cursor.fetchone()
 print(row)
@@ -168,7 +168,7 @@ body = {
     },
     "size": 1
 }
-resp = db_options.es.search(
+resp = DsHelper("es").pool.search(
     index="test",
     body=body
 )
@@ -177,7 +177,7 @@ print(resp)
 
 # es异步测试，async_enable=True
 async def async_es_test():
-    resp = await db_options.es.search(
+    resp = await DsHelper("es").pool.search(
         index="test",
         body={"query": {"match_all": {}}},
         size=1,
@@ -189,7 +189,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_es_test())
 
 # sql server同步测试
-cursor = db_options.mssql.cursor()
+cursor = DsHelper("mssql").pool.cursor()
 cursor.execute('SELECT 1')
 row = cursor.fetchone()
 print(row)
@@ -197,7 +197,7 @@ print(row)
 # sql server暂不支持异步测试
 
 # oracle 同步测试
-cursor = db_options.oracle.cursor()
+cursor = DsHelper("oracle").pool.cursor()
 cursor.execute('select 1')
 row = cursor.fetchone()
 print(row)
@@ -206,12 +206,12 @@ print(row)
 
 
 # mongo同步测试，async_enable=False
-print(db_options.mongo.test.test.find_one())
+print(DsHelper("mongo").pool.test.test.find_one())
 
 
 # mongo异步测试，async_enable=True
 async def async_mongo_test():
-    resp = await db_options.mongo.test.test.find_one()
+    resp = await DsHelper("mongo").pool.test.test.find_one()
     print(resp)
 
 
@@ -219,15 +219,16 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_mongo_test())
 
 # nebula同步测试，async_enable=False
-with db_options.nebula.session_context("root", "nebula") as session:
-    session.execute(f'USE test')
-    result = session.execute("match (t:Test) return t limit 1")
+with DsHelper("nebula").make_nebula_session() as session:
+    session.execute(f'USE core')
+    result = session.execute("match (c:Company) return c limit 1")
     print(result)
 
+print(DsHelper("nebula").exec_nebula_gql("match (c:Company) return c limit 1", "core"))
 # nebula暂不支持异步
 
 # postgresql同步测试，async_enable=False
-with db_options.postgresql.connection() as conn:
+with DsHelper("postgresql").pool.connection() as conn:
     with conn.cursor() as cursor:
         cursor.execute("select 1")
         rs = cursor.fetchone()
@@ -236,7 +237,7 @@ with db_options.postgresql.connection() as conn:
 
 # postgresql异步测试，async_enable=True
 async def async_pg_test():
-    async with db_options.postgresql.acquire() as conn:
+    async with DsHelper("postgresql").pool.acquire() as conn:
         async with conn.cursor() as cur:
             await cur.execute("select 1")
             rs = await cur.fetchone()
@@ -247,12 +248,12 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_pg_test())
 
 # redis 同步测试，async_enable=False
-print(db_options.redis.exists("test"))
+print(DsHelper("redis").pool.exists("test"))
 
 
 # redis 异步测试，async_enable=True
 async def async_redis_test():
-    rs = await db_options.redis.exists("test")
+    rs = await DsHelper("redis").pool.exists("test")
     print(rs)
 
 
@@ -266,52 +267,49 @@ t1 = Table("test_user", meta, Column("name", VARCHAR(collation='utf8mb3_bin', le
                   server_default=None))
 
 # sqlalchemy同步测试，async_enable=False
-with sessionmaker(bind=db_options.sqlalchemy)() as session:
+with DsHelper("sqlalchemy").make_sqlalchemy_session() as session:
     cur = session.execute(select(t1))
     print(cur.fetchall())
 
 
 # sqlalchemy异步测试，async_enable=True
 async def async_sqlalchemy_test():
-    async with async_sessionmaker(db_options.sqlalchemy)() as session:
+    async with DsHelper("sqlalchemy").async_make_sqlalchemy_session() as session:
         cur = await session.execute(select(t1))
-
         print(cur.fetchall())
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_sqlalchemy_test())
 
-
 # neo4j同步测试
 def query(tx):
-    nql = "MATCH (c:Company) return c limit 1"
+    nql = "match (p:Person) return p"
     for record in tx.run(nql):
         print(record)
 
 
-with db_options.neo4j.session(database="invest") as session:
+with DsHelper("neo4j").make_neo4j_session() as session:
     session.execute_read(query)
 
-
 # neo4j异步测试
 async def query(tx):
-    nql = "MATCH (c:Company) return c limit 1"
+    nql = "match (p:Person) return p"
     res = await tx.run(nql)
     async for record in res:
         print(record)
 
-
 async def async_neo4j_test():
-    async with db_options.neo4j.session(database="invest") as session:
+    async with DsHelper("neo4j").async_make_neo4j_session() as session:
         await session.execute_read(query)
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_neo4j_test())
 
+
 # clickhouse 同步测试
-with db_options.clickhouse as conn:
+with DsHelper("clickhouse").pool.dedicated_connection() as conn:
     with conn.cursor() as cursor:
         cursor.execute('SELECT 1')
         print(cursor.fetchall())
@@ -319,7 +317,7 @@ with db_options.clickhouse as conn:
 
 # clickhouse 异步测试测试
 async def async_clickhouse_test():
-    async with db_options.clickhouse.acquire() as conn:
+    async with DsHelper("clickhouse").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("SELECT 1")
             ret = await cursor.fetchone()
@@ -329,5 +327,4 @@ async def async_clickhouse_test():
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_clickhouse_test())
 
-
 ```

{lesscode_database-0.0.5 → lesscode_database-0.0.6}/lesscode_database/db_options.py

@@ -39,7 +39,7 @@ class DbOptions:
                 for conn_info in value:
                     if isinstance(conn_info, ConnectionInfo):
                         if conn_info.enable:
-                            self.__setattr__(conn_info.name, get_pool(conn_info)[0])
+                            self.__setattr__(conn_info.name, get_pool(conn_info))
 
     def __new__(cls):
         if cls._instance is None:

lesscode_database-0.0.6/lesscode_database/ds_helper.py

@@ -0,0 +1,98 @@
+import importlib
+from asyncio import current_task
+from contextlib import contextmanager, asynccontextmanager
+
+from lesscode_database.db_options import db_options
+
+
+class DsHelper:
+    def __init__(self, pool_name):
+        self.pool, self.connect_info = getattr(db_options, pool_name)
+
+    def exec(self, method: str, *args, **kwargs):
+        return getattr(self.pool, method)(*args, **kwargs)
+
+    async def async_exec(self, method: str, *args, **kwargs):
+        return await getattr(self.pool, method)(*args, **kwargs)
+
+    @contextmanager
+    def make_sqlalchemy_session(self, **kwargs):
+        try:
+            sqlalchemy_orm = importlib.import_module("sqlalchemy.orm")
+        except ImportError:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        session = None
+        try:
+            db_session = sqlalchemy_orm.scoped_session(sqlalchemy_orm.sessionmaker(bind=self.pool, **kwargs))
+            session = db_session()
+            yield session
+        except Exception:
+            if session:
+                session.rollback()
+        else:
+            session.commit()
+        finally:
+            if session:
+                session.close()
+
+    @asynccontextmanager
+    async def async_make_sqlalchemy_session(self, **kwargs):
+        try:
+            sqlalchemy_asyncio = importlib.import_module("sqlalchemy.ext.asyncio")
+        except ImportError:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        session = None
+        try:
+            session = sqlalchemy_asyncio.async_scoped_session(
+                sqlalchemy_asyncio.async_sessionmaker(self.pool, **kwargs), current_task)
+            yield session
+        except Exception:
+            if session:
+                await session.rollback()
+        else:
+            await session.commit()
+        finally:
+            if session:
+                await session.close()
+
+    @contextmanager
+    def make_neo4j_session(self, **kwargs):
+        session = None
+        try:
+            session = self.pool.session(database=self.connect_info.db_name, **kwargs)
+            yield session
+        except Exception as e:
+            raise e
+        finally:
+            if session:
+                session.close()
+
+    @asynccontextmanager
+    async def async_make_neo4j_session(self, **kwargs):
+        session = None
+        try:
+            session = self.pool.session(database=self.connect_info.db_name, **kwargs)
+            yield session
+        except Exception as e:
+            raise e
+        finally:
+            if session:
+                await session.close()
+
+    # @contextmanager
+    def make_nebula_session(self, **kwargs):
+        try:
+            session = self.pool.session_context(user_name=self.connect_info.user, password=self.connect_info.password,
+                                                **kwargs)
+            return session
+        except Exception as e:
+            raise e
+
+    def exec_nebula_gql(self, sql, space=None):
+        space = space if space else self.connect_info.db_name
+        if not space:
+            raise Exception(f"nebula no selection space")
+        with self.make_nebula_session() as session:
+            session.execute(f'USE {space}')
+            result = session.execute(sql)
+        return result

lesscode_database-0.0.6/lesscode_database/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.6"

{lesscode_database-0.0.5 → lesscode_database-0.0.6}/lesscode_database.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-database
-Version: 0.0.5
+Version: 0.0.6
 Summary: lesscode_database是数据库连接工具包
 Author: navysummer
 Author-email: navysummer@yeah.net
@@ -20,12 +20,11 @@ License-File: LICENSE
 ```python
 import asyncio
 
-from sqlalchemy import select, Column, VARCHAR, INTEGER, Table, MetaData
-from sqlalchemy.ext.asyncio import async_sessionmaker
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy import select, MetaData, Table, Column, VARCHAR, INTEGER
 
 from lesscode_database.connection_info import ConnectionInfo
 from lesscode_database.db_options import db_options
+from lesscode_database.ds_helper import DsHelper
 
 db_options.conn_list = [
     ConnectionInfo(dialect="mysql", name="mysql", host="127.0.0.1", port=3306, user="root",
@@ -66,8 +65,9 @@ db_options.conn_list = [
 
 ]
 
+
 # mysql 同步测试，async_enable=False
-with db_options.mysql.dedicated_connection() as conn:
+with DsHelper("mysql").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -78,7 +78,7 @@ with db_options.mysql.dedicated_connection() as conn:
 
 # mysql 异步测试，async_enable=True
 async def async_mysql_test():
-    async with db_options.mysql.acquire() as conn:
+    async with DsHelper("mysql").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -89,7 +89,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_mysql_test())
 
 # doris 同步测试，async_enable=False
-with db_options.doris.dedicated_connection() as conn:
+with DsHelper("doris").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -100,7 +100,7 @@ with db_options.doris.dedicated_connection() as conn:
 
 # doris 异步测试，async_enable=True
 async def async_doris_test():
-    async with db_options.doris.acquire() as conn:
+    async with DsHelper("doris").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -111,7 +111,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_doris_test())
 
 # ocean_base 同步测试，async_enable=False
-with db_options.ocean_base.dedicated_connection() as conn:
+with DsHelper("ocean_base").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -122,7 +122,7 @@ with db_options.ocean_base.dedicated_connection() as conn:
 
 # ocean_base 异步测试，async_enable=True
 async def async_ocean_base_test():
-    async with db_options.ocean_base.acquire() as conn:
+    async with DsHelper("ocean_base").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -133,7 +133,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_ocean_base_test())
 
 # tidb 同步测试，async_enable=False
-with db_options.tidb.dedicated_connection() as conn:
+with DsHelper("tidb").pool.dedicated_connection() as conn:
     conn.ping(reconnect=True)
     with conn.cursor() as cursor:
         cursor.execute("select 1")
@@ -144,7 +144,7 @@ with db_options.tidb.dedicated_connection() as conn:
 
 # tidb 异步测试，async_enable=True
 async def async_tidb_test():
-    async with db_options.tidb.acquire() as conn:
+    async with DsHelper("tidb").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("select 1")
             rs = await cursor.fetchone()
@@ -157,7 +157,7 @@ loop.run_until_complete(async_tidb_test())
 
 # sqlite3 异步测试
 async def async_sqlite3_test():
-    cur = await db_options.sqlite3.cursor()
+    cur = await DsHelper("sqlite3").pool.cursor()
     await cur.execute("SELECT 1")
     row = await cur.fetchone()
     print(row)
@@ -167,7 +167,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_sqlite3_test())
 
 # sqlite3 同步测试
-cursor = db_options.sqlite3.cursor()
+cursor = DsHelper("sqlite3").pool.cursor()
 cursor.execute('select 1')
 row = cursor.fetchone()
 print(row)
@@ -181,7 +181,7 @@ body = {
     },
     "size": 1
 }
-resp = db_options.es.search(
+resp = DsHelper("es").pool.search(
     index="test",
     body=body
 )
@@ -190,7 +190,7 @@ print(resp)
 
 # es异步测试，async_enable=True
 async def async_es_test():
-    resp = await db_options.es.search(
+    resp = await DsHelper("es").pool.search(
         index="test",
         body={"query": {"match_all": {}}},
         size=1,
@@ -202,7 +202,7 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_es_test())
 
 # sql server同步测试
-cursor = db_options.mssql.cursor()
+cursor = DsHelper("mssql").pool.cursor()
 cursor.execute('SELECT 1')
 row = cursor.fetchone()
 print(row)
@@ -210,7 +210,7 @@ print(row)
 # sql server暂不支持异步测试
 
 # oracle 同步测试
-cursor = db_options.oracle.cursor()
+cursor = DsHelper("oracle").pool.cursor()
 cursor.execute('select 1')
 row = cursor.fetchone()
 print(row)
@@ -219,12 +219,12 @@ print(row)
 
 
 # mongo同步测试，async_enable=False
-print(db_options.mongo.test.test.find_one())
+print(DsHelper("mongo").pool.test.test.find_one())
 
 
 # mongo异步测试，async_enable=True
 async def async_mongo_test():
-    resp = await db_options.mongo.test.test.find_one()
+    resp = await DsHelper("mongo").pool.test.test.find_one()
     print(resp)
 
 
@@ -232,15 +232,16 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_mongo_test())
 
 # nebula同步测试，async_enable=False
-with db_options.nebula.session_context("root", "nebula") as session:
-    session.execute(f'USE test')
-    result = session.execute("match (t:Test) return t limit 1")
+with DsHelper("nebula").make_nebula_session() as session:
+    session.execute(f'USE core')
+    result = session.execute("match (c:Company) return c limit 1")
     print(result)
 
+print(DsHelper("nebula").exec_nebula_gql("match (c:Company) return c limit 1", "core"))
 # nebula暂不支持异步
 
 # postgresql同步测试，async_enable=False
-with db_options.postgresql.connection() as conn:
+with DsHelper("postgresql").pool.connection() as conn:
     with conn.cursor() as cursor:
         cursor.execute("select 1")
         rs = cursor.fetchone()
@@ -249,7 +250,7 @@ with db_options.postgresql.connection() as conn:
 
 # postgresql异步测试，async_enable=True
 async def async_pg_test():
-    async with db_options.postgresql.acquire() as conn:
+    async with DsHelper("postgresql").pool.acquire() as conn:
         async with conn.cursor() as cur:
             await cur.execute("select 1")
             rs = await cur.fetchone()
@@ -260,12 +261,12 @@ loop = asyncio.get_event_loop()
 loop.run_until_complete(async_pg_test())
 
 # redis 同步测试，async_enable=False
-print(db_options.redis.exists("test"))
+print(DsHelper("redis").pool.exists("test"))
 
 
 # redis 异步测试，async_enable=True
 async def async_redis_test():
-    rs = await db_options.redis.exists("test")
+    rs = await DsHelper("redis").pool.exists("test")
     print(rs)
 
 
@@ -279,52 +280,49 @@ t1 = Table("test_user", meta, Column("name", VARCHAR(collation='utf8mb3_bin', le
                   server_default=None))
 
 # sqlalchemy同步测试，async_enable=False
-with sessionmaker(bind=db_options.sqlalchemy)() as session:
+with DsHelper("sqlalchemy").make_sqlalchemy_session() as session:
     cur = session.execute(select(t1))
     print(cur.fetchall())
 
 
 # sqlalchemy异步测试，async_enable=True
 async def async_sqlalchemy_test():
-    async with async_sessionmaker(db_options.sqlalchemy)() as session:
+    async with DsHelper("sqlalchemy").async_make_sqlalchemy_session() as session:
         cur = await session.execute(select(t1))
-
         print(cur.fetchall())
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_sqlalchemy_test())
 
-
 # neo4j同步测试
 def query(tx):
-    nql = "MATCH (c:Company) return c limit 1"
+    nql = "match (p:Person) return p"
     for record in tx.run(nql):
         print(record)
 
 
-with db_options.neo4j.session(database="invest") as session:
+with DsHelper("neo4j").make_neo4j_session() as session:
     session.execute_read(query)
 
-
 # neo4j异步测试
 async def query(tx):
-    nql = "MATCH (c:Company) return c limit 1"
+    nql = "match (p:Person) return p"
     res = await tx.run(nql)
     async for record in res:
         print(record)
 
-
 async def async_neo4j_test():
-    async with db_options.neo4j.session(database="invest") as session:
+    async with DsHelper("neo4j").async_make_neo4j_session() as session:
         await session.execute_read(query)
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_neo4j_test())
 
+
 # clickhouse 同步测试
-with db_options.clickhouse as conn:
+with DsHelper("clickhouse").pool.dedicated_connection() as conn:
     with conn.cursor() as cursor:
         cursor.execute('SELECT 1')
         print(cursor.fetchall())
@@ -332,7 +330,7 @@ with db_options.clickhouse as conn:
 
 # clickhouse 异步测试测试
 async def async_clickhouse_test():
-    async with db_options.clickhouse.acquire() as conn:
+    async with DsHelper("clickhouse").pool.acquire() as conn:
         async with conn.cursor() as cursor:
             await cursor.execute("SELECT 1")
             ret = await cursor.fetchone()
@@ -342,5 +340,4 @@ async def async_clickhouse_test():
 loop = asyncio.get_event_loop()
 loop.run_until_complete(async_clickhouse_test())
 
-
 ```

lesscode_database-0.0.5/lesscode_database/ds_helper.py

@@ -1,36 +0,0 @@
-import importlib
-from contextlib import contextmanager
-
-from lesscode_database.db_options import db_options
-
-
-class DsHelper:
-    def __init__(self, pool_name):
-        self.pool, self.conn_info = getattr(db_options, pool_name)
-
-    def exec(self, method: str, *args, **kwargs):
-        return getattr(self.pool, method)(*args, **kwargs)
-
-    async def async_exec(self, method: str, *args, **kwargs):
-        return await getattr(self.pool, method)(*args, **kwargs)
-
-    @contextmanager
-    def make_session(self, **kwargs):
-        try:
-            sqlalchemy_orm = importlib.import_module("sqlalchemy.orm")
-        except ImportError:
-            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
-        session = None
-        try:
-            db_session = sqlalchemy_orm.scoped_session(sqlalchemy_orm.sessionmaker(bind=self.pool, **kwargs))
-            session = db_session()
-            yield session
-        except Exception:
-            if session:
-                session.rollback()
-            raise
-        else:
-            session.commit()
-        finally:
-            if session:
-                session.close()

lesscode_database-0.0.5/lesscode_database/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.5"