[新增]日志颜色支持notebook

longfengpili · Jul 27, 2023 · 2c71519 · 2c71519
1 parent 6d4c582
commit 2c71519
Show file tree

Hide file tree

Showing 37 changed files with 150 additions and 131 deletions.
diff --git a/pydbapi/__init__.py b/pydbapi/__init__.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # @Author: chunyang.xu
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:20:31
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:35:31
 # @github: https://github.com/longfengpili
 
+
 import os
 import logging.config
 from pydbapi.conf.logconf import LOGGING_CONFIG

diff --git a/pydbapi/api/__init__.py b/pydbapi/api/__init__.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 17:49:13
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:31:46
 # @github: https://github.com/longfengpili
 
+
 from .redshift import RedshiftDB, SqlRedshiftCompile
 from .sqlite import SqliteDB, SqliteCompile
 from .mysql import MysqlDB, SqlMysqlCompile

diff --git a/pydbapi/api/mysql.py b/pydbapi/api/mysql.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 17:49:58
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:31:52
 # @github: https://github.com/longfengpili
 
+
 import re
 import threading
 import pymysql

diff --git a/pydbapi/api/redshift.py b/pydbapi/api/redshift.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 17:50:05
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:32:58
 # @github: https://github.com/longfengpili
 
+
 import threading
 import psycopg2
 

diff --git a/pydbapi/api/snowflake.py b/pydbapi/api/snowflake.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:05:45
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:33:01
 # @github: https://github.com/longfengpili
 
+
 # import threading
 # import snowflake.connector
 

diff --git a/pydbapi/api/sqlite.py b/pydbapi/api/sqlite.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:04:44
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:32:24
 # @github: https://github.com/longfengpili
 
+
 import os
 import threading
 import sqlite3

diff --git a/pydbapi/api/trino.py b/pydbapi/api/trino.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:04:50
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:33:08
 # @github: https://github.com/longfengpili
 
+
 import re
 import tqdm
 import pandas as pd

diff --git a/pydbapi/col/__init__.py b/pydbapi/col/__init__.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:04:59
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:33:34
 # @github: https://github.com/longfengpili
 
+
 from .colmodel import ColumnModel, ColumnsModel
 
 __all__ = ['ColumnModel', 'ColumnsModel']
diff --git a/pydbapi/col/colmodel.py b/pydbapi/col/colmodel.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:05:10
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:33:37
 # @github: https://github.com/longfengpili
 
+
 class ColumnModel(object):
 
     def __init__(self, newname, coltype='varchar', sqlexpr=None, func=None, order=0, desc=None):

diff --git a/pydbapi/conf/__init__.py b/pydbapi/conf/__init__.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:05:23
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:34:08
 # @github: https://github.com/longfengpili
 
+
 from .myhandlers import MakeFileHandler
 from .logconf import *
 

diff --git a/pydbapi/conf/logconf.py b/pydbapi/conf/logconf.py
@@ -1,11 +1,10 @@
-# @Author: chunyang.xu
-# @Email:  [email protected]
-# @Date:   2020-06-10 14:14:53
-# @Last Modified time: 2022-08-11 11:56:34
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2023-07-26 17:46:27
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:38:28
 # @github: https://github.com/longfengpili
 
-# !/usr/bin/env python3
-# -*- coding:utf-8 -*-
 
 import re
 import os
@@ -17,8 +16,10 @@
 
 # logging settings
 USERPATH = os.environ['USERPROFILE'] if 'USERPROFILE' in os.environ else os.environ['HOME'] if 'HOME' in os.environ else ''
-LOG_BASE_PATH = os.path.join(USERPATH, '.pydbapilog')  # 可以user目录下查看日志
+LOG_BASE_PATH = os.path.join(USERPATH, 'snapilog')  # 可以user目录下查看日志
 PROJECT_NAME = re.sub(':?\\\\', '_', os.getcwd())
+PROJECT_NAME = PROJECT_NAME[1:] if PROJECT_NAME.startswith('/') else PROJECT_NAME  # linux
+
 LOGGING_CONFIG = {
     'version': 1,  # 保留字
     'disable_existing_loggers': False,  # 禁用已经存在的logger实例
@@ -62,7 +63,7 @@
             'level': 'DEBUG',
             'filters': [],
             'class': 'logging.StreamHandler',  #
-            'formatter': 'color' if sys.stdout.isatty() else 'simple'
+            'formatter': 'color' if sys.stdout.isatty() or any("jupyter" in arg for arg in sys.argv) else 'simple'
         },
         # 默认的
         'default': {

diff --git a/pydbapi/conf/myhandlers.py b/pydbapi/conf/myhandlers.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:05:56
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:34:11
 # @github: https://github.com/longfengpili
 
+
 import logging.handlers
 import os
 import errno

diff --git a/pydbapi/db/__init__.py b/pydbapi/db/__init__.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:06:06
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:34:41
 # @github: https://github.com/longfengpili
 
+
 from .base import DBMixin
 from .fileexec import DBFileExec
 

diff --git a/pydbapi/db/base.py b/pydbapi/db/base.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:06:11
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:34:43
 # @github: https://github.com/longfengpili
 
+
 import re
 import pandas as pd
 from tqdm import tqdm

diff --git a/pydbapi/db/fileexec.py b/pydbapi/db/fileexec.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:06:17
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:34:45
 # @github: https://github.com/longfengpili
 
+
 import os
 import time
 

diff --git a/pydbapi/sql/__init__.py b/pydbapi/sql/__init__.py
@@ -1,11 +1,10 @@
-# @Author: chunyang.xu
-# @Email:  [email protected]
-# @Date:   2020-06-03 10:31:36
-# @Last Modified time: 2021-02-01 19:18:38
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2023-06-02 15:27:41
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:35:17
 # @github: https://github.com/longfengpili
 
-# !/usr/bin/env python3
-# -*- coding:utf-8 -*-
 
 from .parse import SqlParse, SqlFileParse
 from .compile import SqlCompile

diff --git a/pydbapi/sql/compile.py b/pydbapi/sql/compile.py
@@ -1,12 +1,10 @@
-# @Author: chunyang.xu
-# @Email:  [email protected]
-# @Date:   2020-06-03 14:04:33
-# @Last Modified time: 2022-08-11 14:59:26
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2023-06-02 15:27:41
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:35:21
 # @github: https://github.com/longfengpili
 
-# !/usr/bin/env python3
-# -*- coding:utf-8 -*-
-
 
 from pydbapi.col import ColumnsModel
 

diff --git a/pydbapi/sql/parse.py b/pydbapi/sql/parse.py
@@ -1,11 +1,10 @@
-# @Author: chunyang.xu
-# @Email:  [email protected]
-# @Date:   2020-06-03 10:51:08
-# @Last Modified time: 2023-02-10 15:17:36
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2023-06-02 15:27:41
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:35:15
 # @github: https://github.com/longfengpili
 
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
 
 import re
 import os

diff --git a/setup.py b/setup.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:19:32
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:43:11
 # @github: https://github.com/longfengpili
-#
+
+
 import os
 import sys
 import shutil
 import setuptools
 
-VERSION = '0.0.107'
+VERSION = '0.0.108'
 PROJECT_NAME = 'pydbapi'
 
 with open('README.md', 'r', encoding='utf-8') as f:

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:19:23
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:42:45
 # @github: https://github.com/longfengpili
diff --git a/tests/base/db_test.py b/tests/base/db_test.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:22:19
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:41:50
 # @github: https://github.com/longfengpili
 
+
 import pytest
 
 from pydbapi.sql import SqlParse

diff --git a/tests/base/sql.sql b/tests/base/sql.sql
@@ -1,10 +1,11 @@
 /*
-* @Author: chunyang.xu
-* @Date:   2020-06-04 17:57:10
-* @Email:  [email protected]
-* @Last Modified time: 2020-06-28 14:18:55
+* @Author: longfengpili
+* @Date:   2023-06-02 15:27:41
+* @Last Modified by:   longfengpili
+* @Last Modified time: 2023-07-27 15:41:50
 */
 
+
 #【arguments】#
 date_min = '2020-02-12'
 date_max = '2020-02-13'

diff --git a/tests/colmodel/__init__.py b/tests/colmodel/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:06:59
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:42:35
 # @github: https://github.com/longfengpili
diff --git a/tests/colmodel/test_colmodel.py b/tests/colmodel/test_colmodel.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:07:04
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:41:50
 # @github: https://github.com/longfengpili
 
 

diff --git a/tests/mysql/__init__.py b/tests/mysql/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# @Author: chunyang.xu
+# @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
-# @Last Modified by:   chunyang.xu
-# @Last Modified time: 2023-07-26 18:07:35
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2023-07-27 15:42:30
 # @github: https://github.com/longfengpili