gomyck-tools 1.5.2__py3-none-any.whl → 1.5.4__py3-none-any.whl

ctools/database/database.py

@@ -1,11 +1,9 @@
 import contextlib
 import datetime
 import math
-import threading
 
-from sqlalchemy import create_engine, BigInteger, Column, event
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker, Session
+from sqlalchemy import create_engine, BigInteger, Column
+from sqlalchemy.orm import sessionmaker, Session, declarative_base
 from sqlalchemy.sql import text
 
 from ctools import call
@@ -14,17 +12,37 @@ from ctools.pools.thread_pool import thread_local
 from ctools.web.bottle_web_base import PageInfo
 
 """
+from time import sleep
+
+from sqlalchemy import text, Column, BigInteger, String
+
+from ctools import cid, cjson
+from ctools.database import database
+from ctools.database.database import BaseMixin
+
 class XXXX(BaseMixin):
   __tablename__ = 't_xxx_info'
   __table_args__ = {'comment': 'xxx信息表'}
   server_content: Column = Column(String(50), nullable=True, default='', comment='123123')
   server_ip: Column = Column(String(30), index=True)
   user_id: Column = Column(BigInteger)
-
-database.init_db('postgresql://postgres:123456@192.168.3.107:32566/abc', default_schema='public', db_key='source', pool_size=100)
-with database.get_session('source') as s:
-  s.execute(text('insert into xxx (name) values (:name)'), {'name': string_tools.get_random_str(5)})
-  s.commit()
+database.init_db('postgresql://postgres:Hylink2014%40postgres@192.168.3.127:31199/postgres', default_schema='public', db_key='source', pool_size=100, auto_gen_table=True)
+while True:
+  with database.get_session('source') as s:
+    params = {
+      'obj_id': cid.get_snowflake_id(),
+      'server_ip': cid.get_random_str(5),
+      'user_id': 123,
+      'server_content': cid.get_random_str(5),
+    }
+    s.execute(text('insert into t_xxx_info (obj_id, server_ip, user_id) values (:obj_id, :server_ip, :user_id)'), params)
+    s.commit()
+    sleep(0.2)
+    res = s.query(XXXX.obj_id, XXXX.server_ip, XXXX.user_id).all()
+    for item in res:
+      print(item._asdict())
+    print(len(res))
+  sleep(1)
 """
 
 Base = None

ctools/stream/ckafka.py

@@ -15,7 +15,7 @@ from ctools.cjson import dumps
 import time
 from datetime import datetime
 
-from ctools import thread_pool, string_tools
+from ctools import thread_pool, cid
 from ctools.ckafka import CKafka
 
 c = CKafka(kafka_url='192.168.3.160:9094', secure=True)
@@ -27,7 +27,7 @@ def send_msg():
   while True:
     command = input('发送消息: Y/n \n')
     if command.strip() not in ['N', 'n']:
-      producer.send_msg('jqxx', '{{"jqid": "{}", "xxxx": "{}"}}'.format(string_tools.get_snowflake_id(), datetime.strftime(datetime.now(), '%Y-%m-%d %H:%M:%S')))
+      producer.send_msg('jqxx', '{{"jqid": "{}", "xxxx": "{}"}}'.format(cid.get_snowflake_id(), datetime.strftime(datetime.now(), '%Y-%m-%d %H:%M:%S')))
     else:
       break
 

ctools/web/bottle_webserver.py

@@ -41,7 +41,6 @@ if __name__ == '__main__':
 
 _default_port = 8888
 
-
 class CBottle:
 
   def __init__(self, bottle: Bottle, port=_default_port, quiet=False):
@@ -56,6 +55,7 @@ class CBottle:
     self.static_root = './static'
     self.download_root = './download'
     self.template_root = './templates'
+    self.server_path = '/api/'
 
     @self.bottle.route(['/', '/index'])
     def index():
@@ -127,21 +127,28 @@ class CBottle:
   def enable_spa_mode(self):
     @self.bottle.error(404)
     def error_404_handler(error):
-      if request.path.startswith('/api/'): return R.error(resp=R.Code.cus_code(404, "资源未找到: {}".format(error.body)))
+      if request.path.startswith(self.server_path):
+        response.status = 404
+        return R.error(resp=R.Code.cus_code(404, "资源未找到: {}".format(error.body)))
       return static_file(filename=self.index_filename, root=self.index_root)
 
     @self.bottle.error(401)
     def unauthorized(error):
+      if request.path.startswith(self.server_path):
+        response.status = 401
+        return R.error(resp=R.Code.cus_code(401, "系统未授权! {}".format(error.body)))
       response.status=301
       response.set_header('Location', urljoin(request.url, '/'))
       return response
 
-  def set_index(self, filename='index.html', root='./', is_tpl=False, redirect_url=None, spa=False, **kwargs):
+  def set_index(self, filename='index.html', root='./', is_tpl=False, redirect_url=None, spa=False, server_path="/api/", **kwargs):
     self.index_root = root
     self.index_filename = filename
     self.is_tpl = is_tpl
     self.redirect_url = redirect_url
-    if spa: self.enable_spa_mode()
+    if spa:
+      self.server_path = server_path
+      self.enable_spa_mode()
     self.tmp_args = kwargs
 
   def set_static(self, root='./static'):

{gomyck_tools-1.5.2.dist-info → gomyck_tools-1.5.4.dist-info}/METADATA

@@ -1,16 +1,16 @@
 Metadata-Version: 2.4
 Name: gomyck-tools
-Version: 1.5.2
+Version: 1.5.4
 Summary: A tools collection for python development by hao474798383
 Author-email: gomyck <hao474798383@163.com>
 License-Expression: Apache-2.0
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: jsonpickle~=3.4.2
-Requires-Dist: SQLAlchemy~=2.0.36
+Requires-Dist: jsonpickle~=4.1.1
+Requires-Dist: SQLAlchemy~=2.0.44
 Requires-Dist: chardet~=5.2.0
-Requires-Dist: psycopg2-binary~=2.9.10
+Requires-Dist: psycopg2-binary~=2.9.11
 Requires-Dist: croniter~=5.0.1
 Requires-Dist: gmssl~=3.2.2
 Requires-Dist: psutil~=6.1.0
@@ -18,27 +18,28 @@ Requires-Dist: jsonpath_ng~=1.7.0
 Requires-Dist: bottle~=0.13.4
 Requires-Dist: requests~=2.32.3
 Requires-Dist: urllib3~=1.26.20
-Requires-Dist: kafka-python~=2.0.2
+Requires-Dist: kafka-python~=2.3.0
 Requires-Dist: bs4~=0.0.2
 Requires-Dist: paho-mqtt~=2.1.0
 Requires-Dist: fuzzywuzzy~=0.18.0
 Requires-Dist: pymysql~=1.1.1
 Requires-Dist: pyzipper==0.3.6
-Requires-Dist: prometheus_client==0.21.1
+Requires-Dist: prometheus_client==0.23.1
 Requires-Dist: paramiko==3.5.0
 Requires-Dist: pyjwt==2.10.1
-Requires-Dist: cryptography==44.0.2
-Requires-Dist: redis==5.2.1
-Requires-Dist: uvloop>=0.21.0
-Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: cryptography==46.0.3
+Requires-Dist: redis==7.1.0
+Requires-Dist: uvloop>=0.22.1
+Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: uiautomation>=2.0.20
 Provides-Extra: kwc
 Requires-Dist: imageio>=2.37.0; extra == "kwc"
 Requires-Dist: wordcloud>=1.9.4; extra == "kwc"
 Requires-Dist: jieba==0.42.1; extra == "kwc"
-Requires-Dist: paddlepaddle==2.6.1; extra == "kwc"
+Requires-Dist: paddlepaddle==3.2.2; extra == "kwc"
 Provides-Extra: cut
 Requires-Dist: jieba==0.42.1; extra == "cut"
-Requires-Dist: paddlepaddle==2.6.1; extra == "cut"
+Requires-Dist: paddlepaddle==3.2.2; extra == "cut"
 Provides-Extra: ml
 Requires-Dist: scikit-learn>=1.7.1; extra == "ml"
 Requires-Dist: pandas>=2.3.2; extra == "ml"

{gomyck_tools-1.5.2.dist-info → gomyck_tools-1.5.4.dist-info}/RECORD

@@ -43,7 +43,7 @@ ctools/cipher/rsa.py,sha256=7TPwlt-JQxDVHwvL_Am9ZKI70B2CfJDqQDf473edHSQ,2264
 ctools/cipher/sign.py,sha256=i__5PVevvR2-VjJyInmyH1QJOpmuxcA9ZIM0oxxFWVo,567
 ctools/cipher/sm_util.py,sha256=cC58wZ9IL08SvUfWUNjX5139fal2SnXGaFQ0R9WA3SE,1675
 ctools/database/__init__.py,sha256=fB36UC93Pya_1YyWGMzDy3D4tMDTBQoYK20E4wgNqec,98
-ctools/database/database.py,sha256=yfW8nw6_rONYz6F1343hmwy_es6eh3WEtKt9jIrStHk,7220
+ctools/database/database.py,sha256=IQzPw2fOJh0Xn_OdSMeEOXBEV9YCRDoszg-dwJPXTTU,7765
 ctools/geo/__init__.py,sha256=OkUaZv5ckkXJFNbRyFZqkX5m3GxTueEGEBU99_jJQNE,98
 ctools/geo/coord_trans.py,sha256=UWCU1wnrTDU1aLSVAwmiHOeH7Pu-Dp8lDLAngDG48NM,3761
 ctools/geo/douglas_rarefy.py,sha256=bJo6TwNxPa-7-8MOi8MULxeqnz4cvIJN-oXqBDWNAVM,4883
@@ -57,7 +57,7 @@ ctools/pools/__init__.py,sha256=3_W3mvEs6pInRTvK7TqOPu9dC2z8rCHvHZFXO4KNYT8,98
 ctools/pools/process_pool.py,sha256=p6Mrh59gXrL9wpQ1dS72-GKtX_lEoAFc4_PLrXjukPk,957
 ctools/pools/thread_pool.py,sha256=ekfoxowyaKWUgevUgRbwee27IFJpqNoz-w27urlX_q8,948
 ctools/stream/__init__.py,sha256=mf8vkbcJdYpvDslgXkkHOz6rKBzU1qfxi8xQGQ1A90w,98
-ctools/stream/ckafka.py,sha256=_vTMIVQBjjsW1iH29BXNQrvEWGgdacDBm3ZrjBjBUGk,5938
+ctools/stream/ckafka.py,sha256=qjb8FX6YDKB_ZVcRpP4ZC5irzJ4FQXh6Ev17Rl6dKOc,5920
 ctools/stream/credis.py,sha256=qxfkhtwHCvGN2eUAr9lpS42um02IXkcZTmiMXs0_Yfg,4551
 ctools/stream/mqtt_utils.py,sha256=HOT8uFOXmgPFRvxcmBPXlOJuhekupleaYwB47lGVSpk,10718
 ctools/util/__init__.py,sha256=jJLxgj-rdTVIo_czMcN83-HQI9yyBYy1L5gw8ZAbmyc,98
@@ -75,14 +75,14 @@ ctools/web/__init__.py,sha256=koSNYeKF5Z_xbp4Q2qbZ4ZP-3--1phbOYN9e4SJy_gk,98
 ctools/web/aio_web_server.py,sha256=p46BOU3_m4Jb57yAACeedKjhlFc1YC0QJSUe2selBgA,5693
 ctools/web/api_result.py,sha256=i1MjTnnlgkWl_q07xr-TLQeLYlXEh4DEclUFE414nSk,1568
 ctools/web/bottle_web_base.py,sha256=iQZJtRQH3HJ-P-48Gspvp1VEd6boAlZfiat3H8E5bBU,8763
-ctools/web/bottle_webserver.py,sha256=Gke_rjRrnUAl0rVe8rkTaq7SPrxb0cHKV_Ln6l7fqus,6854
+ctools/web/bottle_webserver.py,sha256=9IcmQ8dHtbR7VW29sqZ_NM954KNf-V_Z6rJZ4pnz4P4,7169
 ctools/web/bottle_websocket.py,sha256=xsu9fAtTuR5DsSsQjiBfaYxLjOWFyfr1sYM6cktTovI,1957
 ctools/web/ctoken.py,sha256=WaB29kqGlKAh21aUw5avl2h8AgLD1aESw8KCpqaN5nM,2539
 ctools/web/download_util.py,sha256=v0JTXiED1bvoWFfwfd-LD5s7_aoRQ0lCkaGwSnSp7WI,1954
 ctools/web/params_util.py,sha256=eJDV3PSq-ZHb8UZf6xqs8kOhbyZzits1H9yPoUBIDXg,828
 ctools/web/upload_util.py,sha256=z1QQCi4SFx08jrAQH5-Y_ShiM4MghuD_5Qz6V9KK_4U,1076
-gomyck_tools-1.5.2.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
-gomyck_tools-1.5.2.dist-info/METADATA,sha256=g3hKnHGV8s5DRPzimxL0XBhLbvHelBTKi0fAhN_iwto,1826
-gomyck_tools-1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gomyck_tools-1.5.2.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.5.2.dist-info/RECORD,,
+gomyck_tools-1.5.4.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
+gomyck_tools-1.5.4.dist-info/METADATA,sha256=byhNUGqMt6IFVmf5ROsxNuuK3ST4fjcPTKqZa8pzuC4,1862
+gomyck_tools-1.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gomyck_tools-1.5.4.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.5.4.dist-info/RECORD,,