lesscode-flask 0.1.70__tar.gz → 0.1.72__tar.gz

{lesscode_flask-0.1.70 → lesscode_flask-0.1.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.70
+Version: 0.1.72
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.1.70 → lesscode_flask-0.1.72}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.70'
+__version__ = '0.1.72'
 
 import functools
 import logging

{lesscode_flask-0.1.70 → lesscode_flask-0.1.72}/lesscode_flask/service/base_service.py

@@ -158,7 +158,8 @@ class BaseService:
             return data
         return 0
 
-    def page(self, select_columns: list = None, order_columns: list = None, filters: list = None,
+    def page(self, select_columns: list = None, order_columns: list = None, group_columns: list = None,
+             filters: list = None,
              page_num: int = 1,
              page_size: int = 10):
         """
@@ -177,7 +178,8 @@ class BaseService:
             query = query.order_by(*order_columns)
         if select_columns:
             query = query.with_entities(*select_columns)
-
+        if group_columns:
+            query = query.group_by(*group_columns)
         pagination = query.paginate(page=page_num, per_page=page_size, error_out=False)
         # 获取当前页的数据
         items = pagination.items

{lesscode_flask-0.1.70 → lesscode_flask-0.1.72}/lesscode_flask/utils/dify_utils.py

@@ -1,3 +1,4 @@
+import json
 import uuid
 
 import requests
@@ -39,7 +40,8 @@ def dify_chat_messages(api_key, query: str = None, inputs: dict = None, conversa
         response = requests.post(f"{server_url}/v1/chat-messages", headers=headers, json=data, stream=True)
         if "streaming" == response_mode:
             for line in response.iter_lines(decode_unicode=True):
-                yield line
+                if line:  # 过滤掉空行和ping事件
+                    yield f"{line}\n\n"
         else:  # blocking
             res = response.text
             yield res
@@ -87,9 +89,9 @@ def dify_completion_messages(api_key, query: str = None, inputs: dict = None, co
     try:
         response = requests.post(f"{server_url}/v1/completion-messages", headers=headers, json=data, stream=True)
         if "streaming" == response_mode:
-            pass
             for line in response.iter_lines(decode_unicode=True):
-                yield line
+                if line:  # 过滤掉空行和ping事件
+                    yield f"{line}\n\n"
         else:  # blocking
             res = response.text
             yield res
@@ -136,10 +138,9 @@ def dify_workflows_run(api_key, query: str = None, inputs: dict = None, conversa
     try:
         response = requests.post(f"{server_url}/v1/workflows/run", headers=headers, json=data, stream=True)
         if "streaming" == response_mode:
-            pass
             for line in response.iter_lines(decode_unicode=True):
-                if line and line != "event: ping":  # 过滤掉空行和ping事件
-                    yield line
+                if line:  # 过滤掉空行和ping事件
+                    yield f"{line}\n\n"
         else:  # blocking
             res = response.text
             yield res

{lesscode_flask-0.1.70 → lesscode_flask-0.1.72}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.70
+Version: 0.1.72
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.1.70 → lesscode_flask-0.1.72}/lesscode_flask.egg-info/SOURCES.txt

@@ -27,7 +27,6 @@ lesscode_flask/service/resource_param_template_service.py
 lesscode_flask/setting/__init__.py
 lesscode_flask/setup/__init__.py
 lesscode_flask/static/swagger.py
-lesscode_flask/utils/__init__.py
 lesscode_flask/utils/dify_utils.py
 lesscode_flask/utils/helpers.py
 lesscode_flask/utils/decorator/__init__.py

lesscode_flask-0.1.70/lesscode_flask/utils/__init__.py

@@ -1 +0,0 @@
-