PyPI - pyxllib - Versions diffs - 0.3.124__tar.gz → 0.3.126__tar.gz - Mend

pyxllib 0.3.124tar.gz → 0.3.126tar.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.

Files changed (360) hide show

pyxllib-0.3.126/MANIFEST.in ADDED Viewed

@@ -0,0 +1,4 @@
+include README.md
+include requirements.txt
+recursive-include pyxllib *.html
+recursive-include pyxlpr *.py *.txt

{pyxllib-0.3.124/pyxllib.egg-info → pyxllib-0.3.126}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.124
+Version: 0.3.126
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101

{pyxllib-0.3.124 → pyxllib-0.3.126}/pyxllib/data/pglib.py RENAMED Viewed

@@ -801,6 +801,136 @@ class XlprDb(Connection):
         return '<body>' + chart.render_embed() + '</body>', sum(all_users_usaged.values())
+#   cdx_edit
+    def _get_database_trace_total(self, title, yaxis_name, date_trunc, recent, link_name):
+        ls = self.execute(textwrap.dedent(f"""\
+            WITH cte1 AS(
+                SELECT link_name, jsonb_each(status::jsonb) AS db_data, date_trunc('{date_trunc}', update_time) ttime
+                FROM database_trace WHERE update_time > %s AND link_name = '{link_name}'
+            ), cte2 AS(
+                SELECT ttime, link_name, (db_data).key AS table_name, ((db_data).value->> '_total')::bigint AS total
+                FROM cte1
+            )
+            SELECT ttime, jsonb_object_agg(table_name, total) AS aggregated_json,SUM(total) as total
+            FROM cte2
+            GROUP BY ttime
+            ORDER BY ttime"""), ((utc_now(8) - recent).isoformat(timespec='seconds'),)).fetchall()
+        return self.database_create_stack_chart(title, ls, yaxis_name=yaxis_name)
+    def _get_database_trace_per_host(self, db, title, yaxis_name, date_trunc, recent, link_name):
+        ls = self.execute(textwrap.dedent(f"""\
+            WITH cte1 AS (
+                SELECT link_name, jsonb_each(status::jsonb) AS db_data, date_trunc('{date_trunc}', update_time) ttime
+                FROM database_trace WHERE update_time > %s AND link_name = '{link_name}'
+                ), cte2 AS (
+                    SELECT ttime, link_name, (db_data).key AS table_name, (db_data).value AS size_text
+                    FROM cte1
+                ), cte3 AS (
+                    SELECT ttime, table_name, each.key AS key, each.value AS value
+                    FROM cte2, jsonb_each_text(size_text) AS each(key, value)
+                )
+                SELECT ttime, jsonb_object_agg(key,
+                    CASE
+                        WHEN key = '_total' THEN NULL
+                        ELSE (value::jsonb ->> 'size')::bigint  -- Handle other keys as usual
+                    END
+                ) FILTER (WHERE key != '_total') AS aggregated_result,  -- 确保 _total 不在 aggregated_result 中
+                MAX(CASE WHEN key = '_total' THEN value::bigint ELSE NULL END) AS total  -- 单独提取 _total 的值
+                FROM cte3
+                WHERE (key = '_total' OR value::jsonb ? 'size')  -- Ensure that '_total' is included
+                AND table_name = '{db}'
+                GROUP BY ttime
+                ORDER BY ttime"""), ((utc_now(8) - recent).isoformat(timespec='seconds'),)).fetchall()
+        return self.database_create_stack_chart(title, ls, yaxis_name=yaxis_name)
+    def database_create_stack_chart(self, title, ls, *, yaxis_name=''):
+        """ 创建展示表
+        :param title: 表格标题
+        :param list ls: n*3，第1列是时间，第3列是总值，第2列是每个用户具体的数据
+        """
+        from pyecharts.charts import Line
+        all_database_usaged = Counter()
+        last_time = None
+        for x in ls:
+            hours = 0 if last_time is None else ((x[0] - last_time).total_seconds() / 3600)
+            last_time = x[0]
+            for k, v in x[1].items():
+                if k == '_total':
+                    continue
+                all_database_usaged[k] += v * hours
+        for i, x in enumerate(ls):
+            ct = Counter()
+            for k, v in x[1].items():
+                ct[k] += v
+            ls[i] = (x[0], ct, int(x[2]))
+        # 2 转图表可视化
+        def to_list(values):
+            return [(x[0], v) for x, v in zip(ls, values)]
+        def pretty_val(v):
+            return round_int(v) if v > 100 else round(v, 2)
+        chart = Line()
+        chart.set_title(title)
+        chart.options['xAxis'][0].update({'min': ls[0][0], 'type': 'time',
+                                          # 'minInterval': 3600 * 1000 * 24,
+                                          'name': '时间', 'nameGap': 50, 'nameLocation': 'middle'})
+        chart.options['yAxis'][0].update({'name': yaxis_name, 'nameGap': 50, 'nameLocation': 'middle'})
+        # 目前是比较暴力的方法调整排版，后续要研究是不是能更自动灵活些
+        chart.options['legend'][0].update({'top': '6%', 'icon': 'pin'})
+        chart.options['grid'] = [{'top': 55 + len(all_database_usaged) * 4 , 'containLabel': True}]
+        chart.options['tooltip'].opts.update({'axisPointer': {'type': 'cross'}, 'trigger': 'item'})
+        chart.add_series(f'total {pretty_val(ls[0][2]/1024/1024/1024):g}', to_list([x[2]/1024/1024/1024 for x in ls]), areaStyle={})
+        for database, usaged in all_database_usaged.most_common():
+            usaged = usaged / ((ls[-1][0] - ls[0][0]).total_seconds() / 3600 + 1e-9)
+            chart.add_series(f'{database} {pretty_val(usaged/1024/1024/1024):g}',
+                             to_list([x[1].get(database, 0)/1024/1024/1024 for x in ls]),
+                             areaStyle={}, stack='Total', emphasis={'focus': 'series'})
+        return '<body>' + chart.render_embed() + '</body>'
+    def dbview_xldb1_memory(self,recent=datetime.timedelta(days=30), date_trunc='hour'):
+        from pyxllib.data.echarts import render_echart_html
+        db_list = ['st', 'xlpr', 'stdata', 'kq5034', 'ckz']
+        args = ['数据库大小(GB)', date_trunc, recent, 'xldb1']
+        htmltexts = []
+        res = self._get_database_trace_total('XLDB1数据库使用近况', *args)
+        htmltexts.append(res)
+        data_stats = []
+        for idx,db in enumerate(db_list,start=1):
+            data_stats.append(self._get_database_trace_per_host(db,f'{db}', *args))
+        htmltexts += data_stats
+        self.commit()
+        h = render_echart_html('database_cdx', body='<br/>'.join(htmltexts))
+        return h
+    def dbview_xldb2_memory(self, recent=datetime.timedelta(days=30), date_trunc='hour'):
+        from pyxllib.data.echarts import render_echart_html
+        db_list = ['st', 'ragdata']
+        args = ['数据库大小(GB)', date_trunc, recent, 'xldb2']
+        htmltexts = []
+        res = self._get_database_trace_total('XLDB2数据库使用近况', *args)
+        htmltexts.append(res)
+        data_stats = []
+        for idx, db in enumerate(db_list, start=1):
+            data_stats.append(self._get_database_trace_per_host(db, f'{db}', *args))
+        htmltexts += data_stats
+        self.commit()
+        h = render_echart_html('database_cdx', body='<br/>'.join(htmltexts))
+        return h
     def dbview_cpu(self, recent=datetime.timedelta(days=1), date_trunc='hour'):
         from pyxllib.data.echarts import render_echart_html

{pyxllib-0.3.124 → pyxllib-0.3.126}/pyxllib/ext/drissionlib.py RENAMED Viewed

@@ -51,6 +51,34 @@ def get_dp_page(dp_page=None) -> 'XlPage':
         return ChromiumPage()
+def get_dp_tab(dp_page=None) -> 'XlPage':
+    """ 智能获取一个标签页tab
+    :param dp_page:
+        默认None, 返回默认的page，一般就是当前页面
+        True, 新建一个page
+        str, 新建一个对应url的page
+        func(tab), 通过规则筛选tab，返回符合条件的第1个tab，否则新建一个tab
+    """
+    if isinstance(dp_page, ChromiumPage):
+        return dp_page.latest_tab
+    elif isinstance(dp_page, ChromiumTab):
+        return dp_page
+    elif callable(dp_page):
+        page0 = ChromiumPage()
+        for tab in page0.get_tabs():
+            if dp_page(tab):
+                return tab
+        return page0.new_tab()
+    elif dp_page is True:
+        return ChromiumPage().new_tab()
+    elif isinstance(dp_page, str):
+        return ChromiumPage().new_tab(dp_page)
+    else:
+        return ChromiumPage().latest_tab
 def get_latest_not_dev_tab(page=None):
     """ 开发工具本身也会算一个tab，这个函数返回最新的一个不是开发工具的tab """
     if page is None:
@@ -74,7 +102,11 @@ def search_download_file(file_name):
     for file in files:
         if file_name in file['file']:  # 正常情况下的匹配
             return file
-        if file_name in file['file'].replace('+', ' '):  # 但有时候'+'好像有点特别
+    for file in files:
+        file2 = file['file'].replace('+', ' ')
+        if file_name in file2:  # 但有时候'+'好像有点特别
+            return file
+        if file_name in re.sub(r'\s+', ' ', file2):
             return file

{pyxllib-0.3.124 → pyxllib-0.3.126}/pyxllib/ext/unixlib.py RENAMED Viewed

@@ -12,6 +12,12 @@ check_install_package('scp')
 # 对 paramiko 进一步封装的库
 # check_install_package('fabric')
+import warnings
+from cryptography.utils import CryptographyDeprecationWarning
+# 忽略特定的警告
+warnings.filterwarnings("ignore", category=CryptographyDeprecationWarning)
 from collections import defaultdict
 import pathlib
 import re

pyxllib-0.3.126/pyxllib/ext/yuquelib.py ADDED Viewed

@@ -0,0 +1,294 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/01/01
+import requests
+from pyxllib.xl import *
+from pyxllib.algo.stat import *
+from pprint import pprint
+from pyxllib.text.nestenv import NestEnv
+class Yuque:
+    """
+    https://www.yuque.com/yuque/developer/openapi
+    语雀请求限制：每小时最多 5000 次请求，每秒最多 100 次请求
+    """
+    def __init__(self, token, user_id=None):
+        self.base_url = "https://www.yuque.com/api/v2"
+        self.headers = {
+            "X-Auth-Token": token,
+            "Content-Type": "application/json"
+        }
+        self._user_id = user_id
+    def get_user(self):
+        """ 获取用户信息
+        # 获得的内容
+         {'data':
+            {'_serializer': 'v2.user',  # 数据序列化版本
+              # 用户头像URL
+              'avatar_url': 'https://cdn.nlark.com/yuque/0/2020/.../d5f8391e-2fdd-4f1b-8ea5-299be8fceecd.png',
+              'books_count': 12,  # 知识库数量
+              'created_at': '2018-11-16T07:26:27.000Z',  # 账户创建时间
+              'description': '',  # 用户描述
+              'followers_count': 54,  # 跟随者数量
+              'following_count': 6,  # 关注者数量
+              'id': 123456,  # 用户唯一标识
+              'login': 'code4101',  # 用户登录名
+              'name': '代号4101',  # 户昵称或姓名
+              'public': 1,  # 用户公开状态，1为公开
+              'public_books_count': 2,  # 公开的知识库数量
+              'type': 'User',  # 数据类型，这里为'User'
+              'updated_at': '2023-12-31T02:43:16.000Z',  # 信息最后更新时间
+              'work_id': ''}}
+        """
+        url = f"{self.base_url}/user"
+        response = requests.get(url, headers=self.headers)
+        return response.json()
+    @property
+    def user_id(self):
+        """ 很多接口需要用到用户ID，这里缓存一下 """
+        if self._user_id is None:
+            self._user_id = self.get_user()['data']['id']
+        return self._user_id
+    def __1_知识库操作(self):
+        pass
+    @run_once('id,str')  # todo 应该有更好的缓存机制，目前这样的实现，需要重启程序才会刷新
+    def get_repos(self, return_mode=0):
+        """ 获取某个用户的知识库列表
+        :param int|str return_mode: 返回模式
+            0（默认），返回原始json结构
+            df，df结构
+            nickname2id，获取知识库namespace或昵称到ID的映射
+        """
+        if return_mode == 0:
+            url = f"{self.base_url}/users/{self.user_id}/repos"
+            response = requests.get(url, headers=self.headers)
+            return response.json()
+        elif return_mode == 'df':
+            data = self.get_repos()
+            columns = ['id', 'name', 'items_count', 'namespace']
+            ls = []
+            for d in data['data']:
+                ls.append([d[col] for col in columns])
+            df = pd.DataFrame(ls, columns=columns)
+            return df
+        elif return_mode == 'nickname2id':  # namespace、name到id的映射（注意这里不考虑）
+            data = self.get_repos()
+            names2id = {d['name']: d['id'] for d in data['data']}
+            # 例如："日志"知识库的namespace是journal，然后 journal -> 24363220
+            namespace2id = {d['namespace'].split('/')[-1]: d['id'] for d in data['data']}
+            names2id.update(namespace2id)
+            return names2id
+        else:
+            raise ValueError(f'不支持的return_mode={return_mode}')
+    def get_repo_id(self, repo_id):
+        """ repo_id支持输入"昵称"来获得实际id
+        """
+        if isinstance(repo_id, str) and not re.match(r'\d+$', repo_id):
+            repo_id = self.get_repos('nickname2id')[repo_id]
+        return repo_id
+    def get_repo_docs(self, repo_id, *, return_mode=0):
+        """ 获取知识库的文档列表
+        :param repo_id: 知识库的ID或Namespace（如"日志"是我改成的"journal"）
+        :param int|str return_mode: 返回模式
+            0（默认），返回原始json结构
+            -1（df），df结构
+        :return: 文档列表，只能获得最近的100篇文档
+        """
+        repo_id = self.get_repo_id(repo_id)
+        if return_mode == 0:
+            url = f"{self.base_url}/repos/{repo_id}/docs"
+            response = requests.get(url, headers=self.headers)
+            return response.json()
+        elif return_mode in (-1, 'df'):
+            data = self.get_repo_docs(repo_id)
+            # 按照updated_at降序
+            data['data'].sort(key=lambda x: x['updated_at'], reverse=True)
+            columns = ['id', 'title', 'word_count', 'description', 'updated_at']
+            ls = []
+            for d in data['data']:
+                ls.append([d.get(col) for col in columns])
+            # ls.sort(key=lambda x: x[0])  # id一般就是创建顺序
+            df = pd.DataFrame(ls, columns=columns)
+            # df['updated_at']把'2024-08-07T06:13:10.000Z'转成datetime，并改到utf8时区
+            df['updated_at'] = pd.to_datetime(df['updated_at']).dt.tz_convert('Asia/Shanghai')
+            # 不显示时区
+            df['updated_at'] = df['updated_at'].dt.strftime('%Y-%m-%d %H:%M:%S')
+            return df
+        else:
+            raise ValueError(f'不支持的return_mode={return_mode}')
+    def __2_文档操作(self):
+        pass
+    def create_doc(self, repo_id, title, md_content):
+        """ 创建单篇文档，并放到目录开头
+        """
+        # 1 创建文档
+        repo_id = self.get_repo_id(repo_id)
+        url = f"{self.base_url}/repos/{repo_id}/docs"
+        in_data = {
+            "title": title,
+            "body": md_content,
+        }
+        resp = requests.post(url, json=in_data, headers=self.headers)
+        out_data = resp.json()
+        doc_id = out_data['data']['id']
+        # 2 将文档添加到目录中
+        url2 = f"{self.base_url}/repos/{repo_id}/toc"
+        in_data2 = {
+            "action": "prependNode",  # 默认添加到知识库目录最顶上的位置
+            "action_mode": "child",
+            "doc_id": doc_id,
+        }
+        resp2 = requests.put(url2, json=in_data2, headers=self.headers)
+        out_data2 = resp2.json()
+        return out_data2
+    def get_doc(self, repo_id, doc_id):
+        """ 获取单篇文档的详细信息
+        :param repo_id: 知识库的ID或Namespace
+        :param doc_id: 文档的ID
+        :return: 文档的详细信息
+        """
+        repo_id = self.get_repo_id(repo_id)
+        url = f"{self.base_url}/repos/{repo_id}/docs/{doc_id}"
+        response = requests.get(url, headers=self.headers)
+        return response.json()
+    def get_doc_from_url(self, url, return_mode='md'):
+        """ 从文档的URL中获取文档的详细信息
+        :param url: 文档的URL
+        :param return_mode: 返回模式，
+            json, 为原始json结构
+            md, 返回文档的主体md内容
+            title_and_md, 返回文档的标题和md内容
+        :return: 文档的详细信息
+        """
+        repo_slug, doc_slug = url.split('/')[-2:]
+        res = self.get_doc(repo_slug, doc_slug)
+        if return_mode == 'json':
+            return res['data']
+        elif return_mode == 'md':
+            return res['data']['body']
+        elif return_mode == 'title_and_md':
+            return f'文章标题：{res["data"]["title"]}\n\n{res["data"]["body"]}'
+    def export_markdown(self, url, output_dir=None, post_mode=1):
+        """ 导出md格式文件
+        :param str|list[str] url: 文档的URL
+            可以导出单篇文档，也可以打包批量导出多篇文档的md文件
+        :param output_dir: 导出目录
+            单篇的文件名是按照文章标题自动生成的
+            多篇的可以自己指定具体文件名
+        :param post_mode: 后处理模式
+            0，不做处理
+            1，做适当的精简
+        """
+        # 1 获得内容
+        data = self.get_doc_from_url(url, return_mode='json')
+        body = data['body']
+        if post_mode == 0:
+            pass
+        elif post_mode == 1:
+            body = re.sub(r'<a\sname=".*?"></a>\n', '', body)
+        # 2 写入文件
+        if output_dir is not None:
+            title2 = refinepath(data['title'])
+            f = XlPath(output_dir) / f'{title2}.md'
+            f.write_text(body)
+        return body
+    def update_doc(self, repo_id, doc_id, doc_data):
+        """ 更新单篇文档的详细信息
+        :param repo_id: 知识库的ID或Namespace
+        :param doc_id: 文档的ID
+        :param doc_data: 包含文档更新内容的字典
+        :return: 更新后的文档的详细信息
+        """
+        repo_id = self.get_repo_id(repo_id)
+        url = f"{self.base_url}/repos/{repo_id}/docs/{doc_id}"
+        response = requests.put(url, json=doc_data, headers=self.headers)
+        return response.json()
+    def update_doc_from_url(self, url, doc_data, *, md_cvt=True, return_mode='json'):
+        """ 从文档的URL中更新文档的详细信息
+        :param url: 文档的URL
+        :param str|json doc_data: 包含文档更新内容的字典
+            可以直接传入要更新的新的md内容
+            注意无论原始是body_html、body_lake，都是要上传到body字段
+        :param str return_mode: 返回的是更新后文档的内容，不过好像有bug，这里返回的body存储的并不是md格式
+            'md', 返回更新后文档的主体md内容
+            'json', 为原始json结构
+            不建议拿这个返回值，完全可以另外再重新取返回值，就是正常的md格式了
+        :param bool md_cvt: 是否需要转换md格式
+            默认的md文档格式直接放回语雀，是会丢失换行的，需要对代码块外的内容，执行\n替换
+        :return: 更新后的文档的详细信息
+        """
+        # 1 基础配置
+        repo_slug, doc_slug = url.split('/')[-2:]
+        if isinstance(doc_data, str):
+            doc_data = {'body': doc_data}
+        # 2 格式转换
+        if md_cvt:
+            ne = NestEnv(doc_data['body']).search(r'^```[^\n]*\n(.+?)\n^```',
+                                                  flags=re.MULTILINE | re.DOTALL).invert()
+            doc_data['body'] = ne.replace('\n', '\n\n')
+        # 3 提交更新文档
+        res = self.update_doc(repo_slug, doc_slug, doc_data)
+        # 4 拿到返回值
+        if return_mode == 'md':
+            return res['data']
+        elif return_mode == 'json':
+            return res['data']['body']
+    def __3_内容操作(self):
+        pass
+    def read_tables_from_doc(self, url, header=0):
+        """ 从文档中读取表格
+        :param url: 文档的URL
+        :return: 表格列表
+        """
+        res = self.get_doc_from_url(url, return_mode=0)
+        tables = pd.read_html(res['body_html'], header=header)
+        return tables
+if __name__ == '__main__':
+    pass

{pyxllib-0.3.124 → pyxllib-0.3.126}/pyxllib/file/xlsxlib.py RENAMED Viewed

@@ -237,6 +237,8 @@ def xl_render_value(x, xl_fmt):
     注意，遇到公式是很难计算处理的，大概率只能保持原公式显示
     因为日期用的比较多，需要时常获得真实的渲染效果，所以这里封装一个接口
+    对于JSA等场景，直接使用Cell.Text获取渲染值就行，不需要这里这么复杂的实现
     >>> xl_render_value(datetime.datetime(2020, 1, 1), 'yyyy-mm-dd')
     '2020-01-01'
     """
@@ -369,56 +371,59 @@ def load_as_xlsx_file(file_path, keep_links=False, keep_vba=False):
         try:
             return openpyxl.load_workbook(file,
                                           keep_links=keep_links,
-                                          keep_vba=keep_vba)
+                                          keep_vba=keep_vba), ''
         except Exception as e:
-            return
+            if isinstance(e, TimeoutError):  # 这里触发的是总的超时设定
+                raise e
+            return None, format_exception(e, 2)
     @run_once()
     def read_xls():
         try:
-            return convert_xls_to_xlsx(file_path)
+            return convert_xls_to_xlsx(file_path), ''
         except Exception as e:
-            return
+            return None, format_exception(e, 2)
     @run_once()
     def read_csv():
         try:
-            return convert_csv_to_xlsx(file_path)
+            return convert_csv_to_xlsx(file_path), ''
         except Exception as e:
-            return
+            return None, format_exception(e, 2)
     def read_test(suffix):
         if suffix in ('xlsx', 'xlsm', 'zip'):
-            wb = read_xlsx()
+            wb, error = read_xlsx()
         elif suffix == 'xls':
-            wb = read_xls()
+            wb, error = read_xls()
         elif suffix == 'csv':
-            wb = read_csv()
+            wb, error = read_csv()
         else:
-            wb = None
-        return wb
+            wb, error = None, f'不支持的文件类型：{suffix}'
+        return wb, error
     # 1 优先相信用户输入的文件名类型
     file_path = Path(file_path)
     suffix = file_path.suffix.lower()[1:]
-    wb = read_test(suffix)
+    wb, error = read_test(suffix)
     if wb is not None:
         return wb, suffix
     # 2 如果处理不了，则尝试用filetype判断的类型
     suffix2 = filetype.guess(file_path)
     suffix2 = suffix2.extension if suffix2 else ''
-    wb = read_test(suffix2)
+    wb, _ = read_test(suffix2)
     if wb is not None:
         return wb, suffix2
     # 3 如果还处理不了，再把其他可能的情况试一遍
     for suffix in ('xlsx', 'xls', 'csv'):
-        wb = read_test(suffix)
+        wb, _ = read_test(suffix)
         if wb is not None:
             return wb, suffix
-    return None, None
+    # 4 确实是处理不了的类型，返回报错信息
+    return None, error
 def parse_range_address(address):
@@ -2030,7 +2035,7 @@ class XlWorkbook(openpyxl.Workbook):
                         'cells': extract_cells_content(ws)
                     })
-                    if not summary['cells']:  # 如果没有数据，则大概率是数据透视表，是计算出来的，读取不到~
+                    if not summary['cells']:  # 如果没有数据，则大概率是数据透视表，是计算出来的，读取不到~ 但是JSA等场景应该有办法获得
                         summary['sheetType'] = 'PivotTable'
                         del summary['cells']
                 else:
@@ -2478,10 +2483,10 @@ def extract_workbook_summary2(file_path, *,
     res['fileName'] = file_path.name
     start_time = time.time()
     wb, suffix = load_as_xlsx_file(file_path, keep_links=keep_links, keep_vba=keep_vba)
-    if suffix:
-        res['fileType'] = suffix
+    if wb is None:
+        res['error'] = f'Load file error。{suffix}'
     else:
-        res['error'] = 'fileType error'
+        res['fileType'] = suffix
     load_time = time.time() - start_time
     if wb is None:  # 不支持的文件类型，不报错，只是返回最基本的文件名信息

pyxllib-0.3.126/pyxllib/text/templates/echart_base.html ADDED Viewed

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{{ title }}</title>
+    <script type="text/javascript" src="https://assets.pyecharts.org/assets/echarts.min.js"></script>
+</head>
+<body>
+{{ body }}
+</body>
+</html>

pyxllib-0.3.126/pyxllib/text/templates/highlight_code.html ADDED Viewed

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>{{ title }}</title>
+<script src="https://cdn.jsdelivr.net/gh/google/code-prettify@master/loader/run_prettify.js"></script>
+{% if use_mathjax %}
+<script src="https://a.cdn.histudy.com/lib/config/mathjax_config-klxx.js?v=1.1"></script>
+<script type="text/javascript" async="" src="https://a.cdn.histudy.com/lib/mathjax/2.7.1/MathJax/MathJax.js?config=TeX-AMS-MML_SVG">
+MathJax.Hub.Config(MATHJAX_KLXX_CONFIG);
+</script>
+{% else %}
+{% endif%}
+</head>
+<body>
+{{ body }}
+</body>
+</html>

pyxllib 0.3.124__tar.gz → 0.3.126__tar.gz

pyxllib 0.3.124tar.gz → 0.3.126tar.gz