re-common 10.0.41__tar.gz → 10.0.43__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {re_common-10.0.41/re_common.egg-info → re_common-10.0.43}/PKG-INFO +11 -2
- re_common-10.0.43/re_common/v2/baselibrary/s3object/baseaioboto3.py +122 -0
- re_common-10.0.43/re_common/v2/baselibrary/s3object/huaweiobs.py +80 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/base.py +2 -2
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/data_reader.py +9 -6
- re_common-10.0.43/re_common/v2/baselibrary/tools/dir_file_tools.py +27 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/list_tools.py +18 -1
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/api_net_utils.py +49 -21
- re_common-10.0.43/re_common/v2/baselibrary/utils/pinyin_utils.py +178 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/string_bool.py +48 -41
- {re_common-10.0.41 → re_common-10.0.43/re_common.egg-info}/PKG-INFO +11 -2
- {re_common-10.0.41 → re_common-10.0.43}/re_common.egg-info/SOURCES.txt +4 -0
- {re_common-10.0.41 → re_common-10.0.43}/setup.py +1 -1
- {re_common-10.0.41 → re_common-10.0.43}/LICENSE +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/README.md +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/pyproject.toml +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/baseabs/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/baseabs/baseabs.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/database/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/database/mbuilder.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/database/moudle.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/database/msqlite3.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/database/mysql.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/database/sql_factory.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/mthread/MThreadingRun.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/mthread/MThreadingRunEvent.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/mthread/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/mthread/mythreading.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/pakge_other/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/pakge_other/socks.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/readconfig/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/readconfig/config_factory.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/readconfig/ini_config.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/readconfig/toml_config.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/temporary/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/temporary/envdata.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/all_requests/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/all_requests/aiohttp_request.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/all_requests/httpx_requet.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/all_requests/mrequest.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/all_requests/requests_request.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/batch_compre/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/batch_compre/bijiao_batch.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/contrast_db3.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/copy_file.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/db3_2_sizedb3.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/foreachgz.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/get_attr.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/image_to_pdf.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/java_code_deal.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/javacode.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mdb_db3.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/merge_file.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/merge_gz_file.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mhdfstools/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mhdfstools/down_hdfs_files.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mhdfstools/hdfst.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mhdfstools/up_hdfs_files.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mongo_tools.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/move_file.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/move_mongo/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/move_mongo/mongo_table_to_file.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/move_mongo/move_mongo_table.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/move_mongo/use_mttf.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/move_mongo/use_mv.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mpandas/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mpandas/mpandasreadexcel.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/mpandas/pandas_visualization.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/myparsel.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/rename_dir_file.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/sequoiadb_utils.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/split_line_to_many.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/stringtodicts.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/tools/workwechant_bot.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseaiohttp.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseaiomysql.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseallstep.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseavro.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseboto3.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basecsv.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basedict.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basedir.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseencode.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseencoding.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseesdsl.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseexcel.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseexcept.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basefile.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseftp.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basegzip.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basehdfs.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basehttpx.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseip.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basejson.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baselist.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basemotor.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basemssql.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseodbc.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basepandas.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basepeewee.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basepika.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basepydash.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basepymongo.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basequeue.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baserar.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baserequest.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseset.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basesmb.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basestring.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basetime.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basetuple.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/baseurl.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/basezip.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/core/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/core/bottomutils.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/core/mdeprecated.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/core/mlamada.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/core/msginfo.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/core/requests_core.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/fateadm.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/importfun.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/mfaker.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/my_abc/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/my_abc/better_abc.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/mylogger.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/myredisclient.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/pipupgrade.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/ringlist.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/version_compare.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/baselibrary/utils/ydmhttp.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/lazy_import.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/loggerfacade.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/mysqlfacade.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/now.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/sqlite3facade.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/use/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/use/mq_use_facade.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/facade/use/proxy_use_facade.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/base_dict_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/baseavro_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/basefile_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/basemssql_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/baseodbc_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/basepandas_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/get_attr_test/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/get_attr_test/get_attr_test_settings.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/get_attr_test/settings.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/idencode_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/iniconfig_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/ip_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/merge_file_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/mfaker_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/mm3_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/mylogger_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/myparsel_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/mysql_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/pymongo_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/split_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/sqlite3_merge_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/sqlite3_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/tomlconfig_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/use_tools_test/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/libtest/user/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/assignment_expressions.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/mydash/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/mydash/test1.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/pydashstudio/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/pydashstudio/first.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/streamlitstudio/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/streamlitstudio/first_app.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/streamlitstudio/uber_pickups.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/studio/test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/business_utils/BusinessStringUtil.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/business_utils/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/business_utils/baseencodeid.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/business_utils/full_doi_path.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/business_utils/rel_tools.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/decorators/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/decorators/utils.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/helpers/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/helpers/search_packge/NearestNeighbors_test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/helpers/search_packge/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/helpers/search_packge/fit_text_match.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/helpers/search_packge/scikit_learn_text_matcher.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/helpers/search_packge/test.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/s3object/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/s3object/baseboto3.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/WeChatRobot.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/ac_ahocorasick.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/concurrency.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/data_processer.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/data_writer.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/dict_tools.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/dolphinscheduler.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/hdfs_base_processor.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/hdfs_bulk_processor.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/hdfs_data_processer.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/hdfs_line_processor.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/resume_tracker.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/search_hash_tools.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/text_matcher.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/tree_processor/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/tree_processor/builder.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/tree_processor/node.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/unionfind_tools.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/BusinessStringUtil.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/author_smi.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/base_string_similarity.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/basedict.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/basehdfs.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/basepika.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/basetime.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/db.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/elasticsearch.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/json_cls.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/mq.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/n_ary_expression_tree.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/string_clear.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/string_smi.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/utils/stringutils.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/base_step_process.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/baseencodeid.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/changetaskname.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/core_var.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/mmh3Hash.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/allproxys.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/allproxys_thread.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/cnki_proxy.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/kuaidaili.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/proxy_all.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/update_kuaidaili_0.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/wanfang_proxy.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/proxy/wp_proxy_all.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/read_rawid_to_txt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformBookTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformConferenceTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformCstadTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformJournalTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformPatentTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformRegulationTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformStandardTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/TransformThesisTitleToZt.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common/vip/title/transform/__init__.py +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common.egg-info/dependency_links.txt +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/re_common.egg-info/top_level.txt +0 -0
- {re_common-10.0.41 → re_common-10.0.43}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: re_common
|
|
3
|
-
Version: 10.0.
|
|
3
|
+
Version: 10.0.43
|
|
4
4
|
Summary: a library about all python projects
|
|
5
5
|
Home-page: https://gitee.com/xujiangios/re-common
|
|
6
6
|
Author: vic
|
|
@@ -11,6 +11,15 @@ Classifier: Operating System :: OS Independent
|
|
|
11
11
|
Requires-Python: >=3.6
|
|
12
12
|
Description-Content-Type: text/markdown
|
|
13
13
|
License-File: LICENSE
|
|
14
|
+
Dynamic: author
|
|
15
|
+
Dynamic: author-email
|
|
16
|
+
Dynamic: classifier
|
|
17
|
+
Dynamic: description
|
|
18
|
+
Dynamic: description-content-type
|
|
19
|
+
Dynamic: home-page
|
|
20
|
+
Dynamic: license-file
|
|
21
|
+
Dynamic: requires-python
|
|
22
|
+
Dynamic: summary
|
|
14
23
|
|
|
15
24
|
|
|
16
25
|
这是一个基础类,依赖很多的第三方包,是一个用得到的第三方库的封装,可以在此基础上迅速构建项目
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import gzip
|
|
2
|
+
import io
|
|
3
|
+
from typing import Protocol
|
|
4
|
+
|
|
5
|
+
import aioboto3
|
|
6
|
+
import aiofiles
|
|
7
|
+
from aiobotocore.config import AioConfig
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
class AsyncReadable(Protocol):
|
|
11
|
+
async def read(self, n: int = -1) -> bytes:
|
|
12
|
+
...
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
# config = AioConfig(connect_timeout=600000, read_timeout=600000, retries={'max_attempts': 3},
|
|
16
|
+
# max_pool_connections=10)
|
|
17
|
+
|
|
18
|
+
class BaseAioBoto3(object):
|
|
19
|
+
|
|
20
|
+
def __init__(self, aws_access_key_id, aws_secret_access_key, endpoint_url,
|
|
21
|
+
config=AioConfig(max_pool_connections=10)):
|
|
22
|
+
"""
|
|
23
|
+
初始化华为云 OBS 客户端
|
|
24
|
+
|
|
25
|
+
Args:
|
|
26
|
+
access_key: 华为云 Access Key
|
|
27
|
+
secret_key: 华为云 Secret Key
|
|
28
|
+
region: 区域,如 'cn-north-4'
|
|
29
|
+
endpoint: 华为云 OBS 端点,可选
|
|
30
|
+
"""
|
|
31
|
+
self.aws_access_key_id = aws_access_key_id
|
|
32
|
+
self.aws_secret_access_key = aws_secret_access_key
|
|
33
|
+
self.endpoint_url = endpoint_url
|
|
34
|
+
self.config = config
|
|
35
|
+
self.boto_session = None
|
|
36
|
+
|
|
37
|
+
async def initialize_class_variable(self):
|
|
38
|
+
if self.boto_session is None:
|
|
39
|
+
self.boto_session = aioboto3.Session(
|
|
40
|
+
aws_access_key_id=self.aws_access_key_id,
|
|
41
|
+
aws_secret_access_key=self.aws_secret_access_key
|
|
42
|
+
)
|
|
43
|
+
|
|
44
|
+
async def read_minio_data(self, bucket, key):
|
|
45
|
+
await self.initialize_class_variable()
|
|
46
|
+
async with self.boto_session.client("s3", endpoint_url=self.endpoint_url, config=self.config) as s3:
|
|
47
|
+
s3_ob = await s3.get_object(Bucket=bucket, Key=key)
|
|
48
|
+
result = await s3_ob["Body"].read()
|
|
49
|
+
return result
|
|
50
|
+
|
|
51
|
+
def ungzip(self, raw_bytes, encoding="utf-8"):
|
|
52
|
+
with gzip.GzipFile(fileobj=io.BytesIO(raw_bytes)) as gz:
|
|
53
|
+
return gz.read().decode(encoding)
|
|
54
|
+
|
|
55
|
+
# 异步下载大文件
|
|
56
|
+
async def download_file(self, bucket: str, key: str, local_path: str):
|
|
57
|
+
await self.initialize_class_variable()
|
|
58
|
+
async with self.boto_session.client("s3", endpoint_url=self.endpoint_url, config=self.config) as s3:
|
|
59
|
+
response = await s3.get_object(Bucket=bucket, Key=key)
|
|
60
|
+
body = response["Body"]
|
|
61
|
+
|
|
62
|
+
# 用异步方式写入本地
|
|
63
|
+
async with aiofiles.open(local_path, "wb") as f:
|
|
64
|
+
while True:
|
|
65
|
+
chunk = await body.read(10 * 1024 * 1024) # 每次读 10MB
|
|
66
|
+
if not chunk:
|
|
67
|
+
break
|
|
68
|
+
await f.write(chunk)
|
|
69
|
+
|
|
70
|
+
return local_path
|
|
71
|
+
|
|
72
|
+
async def list_files(self, bucket: str, prefix: str, recursive: bool = True):
|
|
73
|
+
"""
|
|
74
|
+
获取 bucket 下某个“目录”(prefix) 的文件列表
|
|
75
|
+
|
|
76
|
+
单文件返回样例 ['server_data/api-title-roc/py_full_organ_dic/', 'server_data/api-title-roc/py_full_organ_dic/part-00000.gz']
|
|
77
|
+
|
|
78
|
+
:param bucket: bucket 名
|
|
79
|
+
:param prefix: 目录前缀,如 'server_data/api-title-roc/'
|
|
80
|
+
:param recursive: 是否递归子目录
|
|
81
|
+
:return: List[str] 文件 key 列表
|
|
82
|
+
"""
|
|
83
|
+
await self.initialize_class_variable()
|
|
84
|
+
keys = []
|
|
85
|
+
|
|
86
|
+
# 非递归时,用 delimiter 模拟目录
|
|
87
|
+
extra_args = {}
|
|
88
|
+
if not recursive:
|
|
89
|
+
extra_args["Delimiter"] = "/"
|
|
90
|
+
|
|
91
|
+
async with self.boto_session.client(
|
|
92
|
+
"s3",
|
|
93
|
+
endpoint_url=self.endpoint_url,
|
|
94
|
+
config=self.config
|
|
95
|
+
) as s3:
|
|
96
|
+
|
|
97
|
+
continuation_token = None
|
|
98
|
+
|
|
99
|
+
while True:
|
|
100
|
+
kwargs = {
|
|
101
|
+
"Bucket": bucket,
|
|
102
|
+
"Prefix": prefix,
|
|
103
|
+
**extra_args
|
|
104
|
+
}
|
|
105
|
+
# 下一页的“游标”
|
|
106
|
+
if continuation_token:
|
|
107
|
+
kwargs["ContinuationToken"] = continuation_token
|
|
108
|
+
|
|
109
|
+
resp = await s3.list_objects_v2(**kwargs)
|
|
110
|
+
|
|
111
|
+
# 文件
|
|
112
|
+
for obj in resp.get("Contents", []):
|
|
113
|
+
keys.append(obj["Key"])
|
|
114
|
+
|
|
115
|
+
# 是否还有下一页
|
|
116
|
+
if resp.get("IsTruncated"): # 说明还有下一页
|
|
117
|
+
# 下一页从哪里继续查
|
|
118
|
+
continuation_token = resp.get("NextContinuationToken")
|
|
119
|
+
else:
|
|
120
|
+
break
|
|
121
|
+
|
|
122
|
+
return keys
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
# pip install pycryptodome==3.10.1
|
|
2
|
+
# pip install esdk-obs-python
|
|
3
|
+
# 引入模块
|
|
4
|
+
import os
|
|
5
|
+
|
|
6
|
+
from obs import ObsClient, GetObjectHeader
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
class BaseObsClient(object):
|
|
10
|
+
|
|
11
|
+
def __init__(self, aws_access_key_id="", aws_secret_access_key="", endpoint_url=""):
|
|
12
|
+
self.aws_access_key_id = aws_access_key_id
|
|
13
|
+
self.aws_secret_access_key = aws_secret_access_key
|
|
14
|
+
self.endpoint_url = endpoint_url
|
|
15
|
+
self.client = None
|
|
16
|
+
if self.aws_access_key_id and self.aws_secret_access_key and self.endpoint_url:
|
|
17
|
+
self.get_client()
|
|
18
|
+
|
|
19
|
+
def get_client(self):
|
|
20
|
+
self.client = ObsClient(access_key_id=self.aws_access_key_id,
|
|
21
|
+
secret_access_key=self.aws_secret_access_key,
|
|
22
|
+
server=self.endpoint_url)
|
|
23
|
+
return self
|
|
24
|
+
|
|
25
|
+
def close(self):
|
|
26
|
+
self.client.close()
|
|
27
|
+
|
|
28
|
+
def put_object(self, bucket_name, objectKey, body):
|
|
29
|
+
"""
|
|
30
|
+
直接写内容到文件
|
|
31
|
+
Args:
|
|
32
|
+
bucket_name:
|
|
33
|
+
key:
|
|
34
|
+
body: 需要
|
|
35
|
+
|
|
36
|
+
Returns:
|
|
37
|
+
"""
|
|
38
|
+
# 上传文本对象
|
|
39
|
+
resp = self.client.putContent(bucket_name, objectKey, body)
|
|
40
|
+
# 返回码为2xx时,接口调用成功,否则接口调用失败
|
|
41
|
+
if resp.status < 300:
|
|
42
|
+
return True, resp
|
|
43
|
+
else:
|
|
44
|
+
return False, resp
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def download_memobj(self, bucket_name, objectKey):
|
|
48
|
+
"""
|
|
49
|
+
return: None
|
|
50
|
+
"""
|
|
51
|
+
# 指定loadStreamInMemory为True忽略downloadpath路径,将文件的二进制流下载到内存
|
|
52
|
+
# 二进制下载对象
|
|
53
|
+
resp = self.client.getObject(bucketName=bucket_name, objectKey=objectKey, loadStreamInMemory=True)
|
|
54
|
+
# 返回码为2xx时,接口调用成功,否则接口调用失败
|
|
55
|
+
if resp.status < 300:
|
|
56
|
+
return True, resp
|
|
57
|
+
else:
|
|
58
|
+
return False, resp
|
|
59
|
+
|
|
60
|
+
def download_file(self, bucket_name, objectKey,downloadPath):
|
|
61
|
+
"""
|
|
62
|
+
return: None
|
|
63
|
+
"""
|
|
64
|
+
headers = GetObjectHeader()
|
|
65
|
+
resp = self.client.getObject(bucket_name, objectKey, downloadPath, headers=headers)
|
|
66
|
+
# 返回码为2xx时,接口调用成功,否则接口调用失败
|
|
67
|
+
if resp.status < 300:
|
|
68
|
+
return True, resp
|
|
69
|
+
else:
|
|
70
|
+
return False, resp
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
def list_prefixes(self,bucket_name,prefix, max_keys = 100):
|
|
74
|
+
# 列举桶内对象
|
|
75
|
+
resp = self.client.listObjects(bucket_name, prefix, max_keys=max_keys, encoding_type='url')
|
|
76
|
+
# 返回码为2xx时,接口调用成功,否则接口调用失败
|
|
77
|
+
if resp.status < 300:
|
|
78
|
+
return True, resp
|
|
79
|
+
else:
|
|
80
|
+
return False, resp
|
{re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/base.py
RENAMED
|
@@ -4,9 +4,9 @@ from typing import List, Generator
|
|
|
4
4
|
|
|
5
5
|
class BaseFileReader(ABC):
|
|
6
6
|
|
|
7
|
-
def __init__(self, batch_size: int = 10000):
|
|
7
|
+
def __init__(self, batch_size: int = 10000, read_model: int = 1):
|
|
8
8
|
self.batch_size = batch_size
|
|
9
|
-
self.read_model =
|
|
9
|
+
self.read_model = read_model
|
|
10
10
|
|
|
11
11
|
@abstractmethod
|
|
12
12
|
def list_files(self, path: str) -> List[str]:
|
{re_common-10.0.41 → re_common-10.0.43}/re_common/v2/baselibrary/tools/data_processer/data_reader.py
RENAMED
|
@@ -12,8 +12,9 @@ from re_common.v2.baselibrary.tools.data_processer.base import BaseFileReader
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
class HDFSFileReader(BaseFileReader):
|
|
15
|
-
def __init__(self, batch_size: int = 1000, hdfs_url: str = "http://VIP-DC-MASTER-2:9870",
|
|
16
|
-
|
|
15
|
+
def __init__(self, batch_size: int = 1000, read_model: int = 1, hdfs_url: str = "http://VIP-DC-MASTER-2:9870",
|
|
16
|
+
hdfs_user: str = "root"):
|
|
17
|
+
super().__init__(batch_size, read_model)
|
|
17
18
|
self.client = InsecureClient(hdfs_url, user=hdfs_user)
|
|
18
19
|
|
|
19
20
|
def list_files(self, path: str) -> List[str]:
|
|
@@ -48,8 +49,9 @@ class HDFSFileReader(BaseFileReader):
|
|
|
48
49
|
|
|
49
50
|
|
|
50
51
|
class HDFSGZFileReader(BaseFileReader):
|
|
51
|
-
def __init__(self, batch_size: int = 1000, hdfs_url: str = "http://VIP-DC-MASTER-2:9870",
|
|
52
|
-
|
|
52
|
+
def __init__(self, batch_size: int = 1000, read_model: int = 1, hdfs_url: str = "http://VIP-DC-MASTER-2:9870",
|
|
53
|
+
hdfs_user: str = "root"):
|
|
54
|
+
super().__init__(batch_size, read_model)
|
|
53
55
|
self.hdfs_url = hdfs_url
|
|
54
56
|
self.hdfs_user = hdfs_user
|
|
55
57
|
self.client = None
|
|
@@ -99,8 +101,9 @@ class HDFSGZFileReader(BaseFileReader):
|
|
|
99
101
|
|
|
100
102
|
|
|
101
103
|
class HDFSParquetFileReader(BaseFileReader):
|
|
102
|
-
def __init__(self, batch_size: int = 1000, hdfs_url: str = "http://VIP-DC-MASTER-2:9870",
|
|
103
|
-
|
|
104
|
+
def __init__(self, batch_size: int = 1000, read_model: int = 1, hdfs_url: str = "http://VIP-DC-MASTER-2:9870",
|
|
105
|
+
hdfs_user: str = "root"):
|
|
106
|
+
super().__init__(batch_size, read_model)
|
|
104
107
|
self.client = InsecureClient(hdfs_url, user=hdfs_user)
|
|
105
108
|
|
|
106
109
|
def list_files(self, path: str) -> List[str]:
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import json
|
|
2
|
+
import os
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
def scan_dir_fast(path):
|
|
6
|
+
file_infos = []
|
|
7
|
+
with os.scandir(path) as entries:
|
|
8
|
+
for entry in entries:
|
|
9
|
+
if entry.is_file():
|
|
10
|
+
info = entry.stat()
|
|
11
|
+
file_infos.append({
|
|
12
|
+
"path": entry.path,
|
|
13
|
+
"size": info.st_size
|
|
14
|
+
})
|
|
15
|
+
return file_infos
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
def scan_dir(dir_name, result_file):
|
|
19
|
+
# dir_name r"/share/fulltext/errors"
|
|
20
|
+
# result_file "file_info_errors.txt"
|
|
21
|
+
for root, dirs, files in os.walk(dir_name):
|
|
22
|
+
print(root)
|
|
23
|
+
lists = scan_dir_fast(root)
|
|
24
|
+
with open(result_file, "a", encoding="utf-8") as file:
|
|
25
|
+
for i in lists:
|
|
26
|
+
if i:
|
|
27
|
+
file.write(json.dumps(i, ensure_ascii=False) + "\n")
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import itertools
|
|
2
|
+
from collections import Counter
|
|
2
3
|
from typing import List, Any, Tuple
|
|
3
4
|
|
|
4
5
|
|
|
@@ -67,4 +68,20 @@ def list_to_dict(list_data,key_name):
|
|
|
67
68
|
|
|
68
69
|
def split_list_by_step(lst, step=100):
|
|
69
70
|
# 一维列表按照步长转换成二维列表
|
|
70
|
-
return [lst[i:i + step] for i in range(0, len(lst), step)]
|
|
71
|
+
return [lst[i:i + step] for i in range(0, len(lst), step)]
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
def list_diff(l1, l2):
|
|
75
|
+
"""
|
|
76
|
+
非去重差异比较
|
|
77
|
+
Counter 虽然长得像字典,但它在运算符 & 和 - 上有特殊的定义。
|
|
78
|
+
这样 能获取重复差集
|
|
79
|
+
"""
|
|
80
|
+
c1, c2 = Counter(l1), Counter(l2)
|
|
81
|
+
# 共同部分
|
|
82
|
+
common = list((c1 & c2).elements())
|
|
83
|
+
# l1 多余的部分
|
|
84
|
+
extra1 = list((c1 - c2).elements())
|
|
85
|
+
# l2 多余的部分
|
|
86
|
+
extra2 = list((c2 - c1).elements())
|
|
87
|
+
return common, extra1, extra2
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import atexit
|
|
2
|
+
import os
|
|
2
3
|
import sys
|
|
3
4
|
import asyncio
|
|
5
|
+
import traceback
|
|
6
|
+
|
|
4
7
|
import aiohttp
|
|
5
|
-
from typing import Optional
|
|
8
|
+
from typing import Optional, Union
|
|
6
9
|
|
|
7
10
|
from tenacity import retry, stop_after_attempt, wait_random
|
|
8
11
|
|
|
@@ -62,6 +65,13 @@ def on_retry_error(retry_state):
|
|
|
62
65
|
|
|
63
66
|
def on_retry(retry_state):
|
|
64
67
|
# 每次抛错进入该函数打印消息
|
|
68
|
+
|
|
69
|
+
# # 获取函数调用参数
|
|
70
|
+
# args = retry_state.args
|
|
71
|
+
# kwargs = retry_state.kwargs
|
|
72
|
+
#
|
|
73
|
+
# print(id(args[0]._get_session()))
|
|
74
|
+
|
|
65
75
|
print(
|
|
66
76
|
f"[HTTP 请求重试]"
|
|
67
77
|
f"当前重试 : 第 {retry_state.attempt_number} 次"
|
|
@@ -84,6 +94,8 @@ class ApiNetUtils:
|
|
|
84
94
|
_conn: Optional[aiohttp.TCPConnector] = None
|
|
85
95
|
_session: Optional[aiohttp.ClientSession] = None
|
|
86
96
|
_close_registered: bool = False # 确保清理函数只注册一次
|
|
97
|
+
_pid: Optional[int] = None # 当前进程的 PID
|
|
98
|
+
lock = asyncio.Lock()
|
|
87
99
|
|
|
88
100
|
@classmethod
|
|
89
101
|
async def _get_connector(cls) -> aiohttp.TCPConnector:
|
|
@@ -96,9 +108,9 @@ class ApiNetUtils:
|
|
|
96
108
|
cls._conn = aiohttp.TCPConnector(
|
|
97
109
|
limit=50, # 最大连接数
|
|
98
110
|
ssl=False, # 禁用SSL验证(按需开启)
|
|
99
|
-
force_close=
|
|
100
|
-
|
|
101
|
-
|
|
111
|
+
force_close=False, # 保持连接活跃
|
|
112
|
+
enable_cleanup_closed=True, # 自动清理关闭的连接 #
|
|
113
|
+
keepalive_timeout=4.99 # 比服务器的5s 小一点
|
|
102
114
|
)
|
|
103
115
|
return cls._conn
|
|
104
116
|
|
|
@@ -108,25 +120,41 @@ class ApiNetUtils:
|
|
|
108
120
|
获取共享会话(线程安全的延迟初始化)
|
|
109
121
|
包含自动注册清理机制
|
|
110
122
|
"""
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
123
|
+
async with cls.lock:
|
|
124
|
+
current_pid = os.getpid()
|
|
125
|
+
if cls._pid != current_pid:
|
|
126
|
+
# 新进程,重新初始化
|
|
127
|
+
if cls._session:
|
|
128
|
+
await cls.close()
|
|
129
|
+
cls._pid = current_pid
|
|
130
|
+
|
|
131
|
+
if cls._session is None or cls._session.closed or cls.is_loop_closed(cls._session):
|
|
132
|
+
if cls._session:
|
|
133
|
+
await cls.close()
|
|
134
|
+
# 获取连接器(会自动初始化)
|
|
135
|
+
connector = await cls._get_connector()
|
|
136
|
+
|
|
137
|
+
# 强制获取新的事件循环
|
|
138
|
+
loop = asyncio.get_event_loop()
|
|
139
|
+
|
|
140
|
+
timeout = aiohttp.ClientTimeout(
|
|
141
|
+
total=120, # 整个请求最多 30 秒
|
|
142
|
+
connect=10, # 最多 5 秒连接
|
|
143
|
+
sock_connect=10,
|
|
144
|
+
sock_read=110, # 最多 20 秒读取响应数据
|
|
145
|
+
)
|
|
119
146
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
147
|
+
# 创建新会话
|
|
148
|
+
cls._session = aiohttp.ClientSession(
|
|
149
|
+
connector=connector,
|
|
150
|
+
timeout=timeout, # 默认30秒超时
|
|
151
|
+
loop=loop,
|
|
152
|
+
) # 显式指定事件循环
|
|
125
153
|
|
|
126
|
-
|
|
127
|
-
|
|
154
|
+
# # 注册退出时的清理钩子
|
|
155
|
+
cls._register_cleanup()
|
|
128
156
|
|
|
129
|
-
|
|
157
|
+
return cls._session
|
|
130
158
|
|
|
131
159
|
@staticmethod
|
|
132
160
|
def is_loop_closed(session: aiohttp.ClientSession) -> bool:
|
|
@@ -135,7 +163,7 @@ class ApiNetUtils:
|
|
|
135
163
|
"""
|
|
136
164
|
loop = session._loop # 获取会话绑定的事件循环
|
|
137
165
|
if loop.is_closed():
|
|
138
|
-
|
|
166
|
+
print("Event loop is closed")
|
|
139
167
|
return True
|
|
140
168
|
# print("Event loop not is closed")
|
|
141
169
|
return False
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import itertools
|
|
2
|
+
from typing import List, Any
|
|
3
|
+
|
|
4
|
+
from pypinyin import pinyin, Style
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class PinyinUtils:
|
|
8
|
+
@staticmethod
|
|
9
|
+
def get_pinyin_or_char(text: str) -> str:
|
|
10
|
+
"""拼音 + 非中文原样返回 对应 toPinyin"""
|
|
11
|
+
result = []
|
|
12
|
+
for char in text:
|
|
13
|
+
if PinyinUtils.is_chinese(char):
|
|
14
|
+
py_one = pinyin(char, style=Style.NORMAL, v_to_u=True, heteronym=True)
|
|
15
|
+
result.append(py_one[0][0] if py_one else char)
|
|
16
|
+
else:
|
|
17
|
+
result.append(char)
|
|
18
|
+
return "".join(result)
|
|
19
|
+
|
|
20
|
+
@staticmethod
|
|
21
|
+
def get_pinyin_or_char_ex(text: str) -> str:
|
|
22
|
+
"""拼音 + 非中文原样返回 对应 toPinyin"""
|
|
23
|
+
result = []
|
|
24
|
+
for char in text:
|
|
25
|
+
if PinyinUtils.is_chinese(char):
|
|
26
|
+
py_one = pinyin(char, style=Style.NORMAL, v_to_u=True, heteronym=True)
|
|
27
|
+
result.append("|".join(py_one[0]) if py_one else char)
|
|
28
|
+
else:
|
|
29
|
+
result.append(char)
|
|
30
|
+
return "".join(result)
|
|
31
|
+
|
|
32
|
+
@staticmethod
|
|
33
|
+
def is_chinese(char: str) -> bool:
|
|
34
|
+
"""判断是否为汉字"""
|
|
35
|
+
return "\u4e00" <= char <= "\u9fff"
|
|
36
|
+
|
|
37
|
+
@staticmethod
|
|
38
|
+
def combine(lists: List[List[Any]]) -> list:
|
|
39
|
+
# lists = [[1, 2],['a', 'b'],[True, False]]
|
|
40
|
+
# 计算笛卡尔积
|
|
41
|
+
cartesian_product = list(itertools.product(*lists))
|
|
42
|
+
|
|
43
|
+
return [" ".join([str(ii) for ii in list(i)]) for i in cartesian_product]
|
|
44
|
+
|
|
45
|
+
@staticmethod
|
|
46
|
+
def to_pinyin_names(name: str) -> List[str]:
|
|
47
|
+
"""
|
|
48
|
+
将中文姓名转换为所有可能的拼音组合
|
|
49
|
+
|
|
50
|
+
Args:
|
|
51
|
+
name: 中文姓名字符串
|
|
52
|
+
|
|
53
|
+
Returns:
|
|
54
|
+
所有可能的拼音组合列表
|
|
55
|
+
"""
|
|
56
|
+
if not name:
|
|
57
|
+
return []
|
|
58
|
+
|
|
59
|
+
pinyin_options = []
|
|
60
|
+
|
|
61
|
+
for char in name:
|
|
62
|
+
py_one = PinyinUtils.get_pinyin_or_char_ex(char)
|
|
63
|
+
variants = []
|
|
64
|
+
|
|
65
|
+
if "ü" in py_one:
|
|
66
|
+
# 处理ü的特殊情况,生成u和v两种变体
|
|
67
|
+
for replacement in ["u", "v"]:
|
|
68
|
+
replaced = py_one.replace("ü", replacement)
|
|
69
|
+
variants.extend(replaced.split("|"))
|
|
70
|
+
variants = list(set(variants))
|
|
71
|
+
else:
|
|
72
|
+
variants = py_one.split("|")
|
|
73
|
+
|
|
74
|
+
pinyin_options.append(variants)
|
|
75
|
+
|
|
76
|
+
return PinyinUtils.combine(pinyin_options)
|
|
77
|
+
|
|
78
|
+
@staticmethod
|
|
79
|
+
def to_pinyin_name(name: str) -> str:
|
|
80
|
+
"""
|
|
81
|
+
将中文姓名转换为拼音字符串
|
|
82
|
+
|
|
83
|
+
Args:
|
|
84
|
+
name: 中文字符串
|
|
85
|
+
|
|
86
|
+
Returns:
|
|
87
|
+
拼音字符串,用空格分隔每个字的拼音
|
|
88
|
+
"""
|
|
89
|
+
result = []
|
|
90
|
+
for char in name:
|
|
91
|
+
py_one = PinyinUtils.get_pinyin_or_char(char).replace("ü", "v")
|
|
92
|
+
result.append(py_one)
|
|
93
|
+
return " ".join(result)
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
VALID_PINYINS = {
|
|
97
|
+
"a", "o", "e", "ai", "ei", "ao", "ou", "an", "en", "ang", "eng", "er",
|
|
98
|
+
"ba", "bai", "ban", "bang", "bao", "bei", "ben", "beng", "bi", "bian", "biao", "bie", "bin", "bing", "bo", "bu",
|
|
99
|
+
"pa", "pai", "pan", "pang", "pao", "pei", "pen", "peng", "pi", "pian", "piao", "pie", "pin", "ping", "po", "pu",
|
|
100
|
+
"ma", "mai", "man", "mang", "mao", "mei", "men", "meng", "mi", "mian", "miao", "mie", "min", "ming", "mo",
|
|
101
|
+
"mou",
|
|
102
|
+
"mu",
|
|
103
|
+
"fa", "fan", "fang", "fei", "fen", "feng", "fo", "fou", "fu",
|
|
104
|
+
"da", "dai", "dan", "dang", "dao", "dei", "den", "deng", "di", "dian", "diao", "die", "ding", "diu", "dong",
|
|
105
|
+
"dou",
|
|
106
|
+
"du", "duan", "dui", "dun", "duo",
|
|
107
|
+
"ta", "tai", "tan", "tang", "tao", "tei", "teng", "ti", "tian", "tiao", "tie", "ting", "tong", "tou", "tu",
|
|
108
|
+
"tuan",
|
|
109
|
+
"tui", "tun", "tuo",
|
|
110
|
+
"na", "nai", "nan", "nang", "nao", "nei", "nen", "neng", "ni", "nian", "niang", "niao", "nie", "nin", "ning",
|
|
111
|
+
"niu",
|
|
112
|
+
"nong", "nou", "nu", "nuan", "nue", "nv",
|
|
113
|
+
"la", "lai", "lan", "lang", "lao", "lei", "leng", "li", "lia", "lian", "liang", "liao", "lie", "lin", "ling",
|
|
114
|
+
"liu",
|
|
115
|
+
"lo", "long", "lou", "lu", "luan", "lue", "lv",
|
|
116
|
+
"ga", "gai", "gan", "gang", "gao", "ge", "gei", "gen", "geng", "gong", "gou", "gu", "gua", "guai", "guan",
|
|
117
|
+
"guang",
|
|
118
|
+
"gui", "gun", "guo",
|
|
119
|
+
"ka", "kai", "kan", "kang", "kao", "ke", "ken", "keng", "kong", "kou", "ku", "kua", "kuai", "kuan", "kuang",
|
|
120
|
+
"kui",
|
|
121
|
+
"kun", "kuo",
|
|
122
|
+
"ha", "hai", "han", "hang", "hao", "he", "hei", "hen", "heng", "hong", "hou", "hu", "hua", "huai", "huan",
|
|
123
|
+
"huang",
|
|
124
|
+
"hui", "hun", "huo",
|
|
125
|
+
"ji", "jia", "jian", "jiang", "jiao", "jie", "jin", "jing", "jiong", "jiu", "ju", "juan", "jue", "jun",
|
|
126
|
+
"qi", "qia", "qian", "qiang", "qiao", "qie", "qin", "qing", "qiong", "qiu", "qu", "quan", "que", "qun",
|
|
127
|
+
"xi", "xia", "xian", "xiang", "xiao", "xie", "xin", "xing", "xiong", "xiu", "xu", "xuan", "xue", "xun",
|
|
128
|
+
"zha", "zhai", "zhan", "zhang", "zhao", "zhe", "zhei", "zhen", "zheng", "zhong", "zhou", "zhu", "zhua", "zhuai",
|
|
129
|
+
"zhuan", "zhuang", "zhui", "zhun", "zhuo",
|
|
130
|
+
"cha", "chai", "chan", "chang", "chao", "che", "chen", "cheng", "chi", "chong", "chou", "chu", "chua", "chuai",
|
|
131
|
+
"chuan", "chuang", "chui", "chun", "chuo",
|
|
132
|
+
"sha", "shai", "shan", "shang", "shao", "she", "shei", "shen", "sheng", "shi", "shou", "shu", "shua", "shuai",
|
|
133
|
+
"shuan", "shuang", "shui", "shun", "shuo",
|
|
134
|
+
"ra", "ran", "rang", "rao", "re", "ren", "reng", "ri", "rong", "rou", "ru", "rua", "ruan", "rui", "run", "ruo",
|
|
135
|
+
"za", "zai", "zan", "zang", "zao", "ze", "zei", "zen", "zeng", "zong", "zou", "zu", "zuan", "zui", "zun", "zuo",
|
|
136
|
+
"ca", "cai", "can", "cang", "cao", "ce", "cen", "ceng", "cong", "cou", "cu", "cuan", "cui", "cun", "cuo",
|
|
137
|
+
"sa", "sai", "san", "sang", "sao", "se", "sen", "seng", "song", "sou", "su", "suan", "sui", "sun", "suo",
|
|
138
|
+
"ya", "yan", "yang", "yao", "ye", "yi", "yin", "ying", "yo", "yong", "you", "yu", "yuan", "yue", "yun",
|
|
139
|
+
"wa", "wai", "wan", "wang", "wei", "wen", "weng", "wo", "wu"
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
|
|
143
|
+
def split_pinyin_all(s):
|
|
144
|
+
s = s.lower()
|
|
145
|
+
results = []
|
|
146
|
+
|
|
147
|
+
def dfs(start, path):
|
|
148
|
+
if start == len(s):
|
|
149
|
+
results.append(path[:])
|
|
150
|
+
return
|
|
151
|
+
for end in range(start + 1, min(len(s), start + 6) + 1):
|
|
152
|
+
part = s[start:end]
|
|
153
|
+
if part in VALID_PINYINS:
|
|
154
|
+
path.append(part)
|
|
155
|
+
dfs(end, path)
|
|
156
|
+
path.pop()
|
|
157
|
+
|
|
158
|
+
dfs(0, [])
|
|
159
|
+
return results
|
|
160
|
+
|
|
161
|
+
|
|
162
|
+
def is_pinyin(word):
|
|
163
|
+
"""检测一个字符串是否是合法拼音(无歧义)"""
|
|
164
|
+
try:
|
|
165
|
+
# 尝试转换为拼音,如果原词是拼音,转换结果应该和原词相近
|
|
166
|
+
pinyin_list = pinyin(word, style=Style.NORMAL)
|
|
167
|
+
reconstructed = "".join([p[0] for p in pinyin_list])
|
|
168
|
+
# 检查转换后的拼音是否与原词相似(忽略大小写)
|
|
169
|
+
return word.lower() == reconstructed.lower()
|
|
170
|
+
except:
|
|
171
|
+
return False
|
|
172
|
+
|
|
173
|
+
def split_pinyin(word):
|
|
174
|
+
lists = split_pinyin_all(word)
|
|
175
|
+
lists = [" ".join(i) for i in lists]
|
|
176
|
+
if not lists:
|
|
177
|
+
return [word]
|
|
178
|
+
return lists
|