-
- ✖️
-
- 
-
-
-
- ✖️
-
-
-
- -
-GitHub | 🤖 ModelScope Studio ｜ 🤗 Hugging Face Space
+# ModelScope Studio
`modelscope_studio` 是一套基于 gradio 4.x 的扩展组件库，致力于服务于 ModelScope 创空间中对于 gradio 应用的各类扩展需求，目前主要聚集在对话场景增强、多模态场景以及一些其他垂直场景支持。
@@ -19,15 +8,8 @@
pip install modelscope_studio
```
-## API
-
--
-
-
- ✖️
-
-
-
- -
-GitHub | 🤖 ModelScope Studio ｜ 🤗 Hugging Face Space
+# ModelScope Studio
`modelscope_studio` is a set of extension component libraries based on gradio 4.x, dedicated to serving the various extension needs of gradio applications within the ModelScope Studio. It mainly focuses on enhancing conversational scenarios, supporting multimodal contexts, and providing assistance for various other specialized scenarios.
@@ -35,15 +24,8 @@ license: apache-2.0
pip install modelscope_studio
```
-## API
-
--
- 当传入 dict 时，必须包含有avatar字段。
- 当传入 list 时，一般对应多 bot 模式，每一项可以接收前面所有的值，每个 bot 的头像与 message 中 bot 的位置一一对应 |
-| avatar_image_align | Literal['top', 'middle', 'bottom'] | 'bottom' | 控制头像与 message 的对齐方式，默认为下对齐 |
-| avatar_image_width | int | 45 | 头像与名称的宽度 |
-| flushing_speed | int | 3 | 打字机速度，值为 1 - 10，值越大速度越快 |
-| llm_thinking_presets | list\[dict\] | \[\] | llm 思考链路解析预设，可以将 llm 调用工具的输出格式转为固定的前端展示格式，需要从modelscope_studio.Chatbot.llm_thinking_presets引入，目前支持：qwen |
-| custom_components | dict\[str, CustomComponentDict\] CustomComponentDict 定义见下方 | None | 支持用户定义自定义标签，并通过 js 控制标签渲染样式与触发 python 事件。 |
-
-**CustomComponentDict 定义如下**
+| 属性 | 类型 | 默认值 | 描述 |
+| -------------------- | -------------------------------------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| flushing | bool | True | 是否开启打字机效果。默认只有 bot 的 message 会开启，可以通过单独修改 message 的 flushing 属性精确控制每一条 message 的显示效果 |
+| enable_base64 | bool | False | 是否支持渲染的内容为 base64，因为直接渲染 base64 有安全问题，默认为 False。 |
+| preview | bool | True | 是否开启图片预览功能 |
+| avatar_images | tuple\[str \| Path \| None \| dict \| list, str \| Path \| None \| dict\| list\] | None | 拓展gr.Chatbot的参数值，除了接收 url 外还可以接收 dict 和 list，dict 可以传入avatar和name字段，name字段在渲染时会显示在头像下方。
- 当传入 dict 时，必须包含有avatar字段。
- 当传入 list 时，一般对应多 bot 模式，每一项可以接收前面所有的值，每个 bot 的头像与 message 中 bot 的位置一一对应 |
+| avatar_image_align | Literal['top', 'middle', 'bottom'] | 'bottom' | 控制头像与 message 的对齐方式，默认为下对齐 |
+| avatar_image_width | int | 45 | 头像与名称的宽度 |
+| flushing_speed | int | 3 | 打字机速度，值为 1 - 10，值越大速度越快 |
+| llm_thinking_presets | list\[dict\] | \[\] | llm 思考链路解析预设，可以将 llm 调用工具的输出格式转为固定的前端展示格式，需要从modelscope_studio.Chatbot.llm_thinking_presets引入，目前支持：qwen |
+| custom_components | dict\[str, CustomComponentDict\] CustomComponentDict 定义见下方 | None | 支持用户定义自定义标签，并通过 js 控制标签渲染样式与触发 python 事件。 |
+
+**CustomComponent 定义如下**
```python
class CustomComponentDict(TypedDict):
@@ -138,7 +123,7 @@ class CustomComponentDict(TypedDict):
### event listeners
-| 事件 | 描述 |
-| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `mgr.Chatbot.flushed(fn, ···)` | 当打字机效果结束时触发。EventData 为：
- index：当前 message 的 index tuple。
- value：当前 message value。 |
-| `mgr.Chatbot.custom(fn, ···)` | 自定义标签触发事件时触发，EventData 为：
- index：当前 message 的 index tuple ([message index, user group(index 0) or bot group(index 1), user/bot group index])。
- tag：当前触发的标签。
- tag_index：当前触发标签的 index，此 index 在 message 的 index tuple 基础上重新计算。
- value：自定义传入的值。 |
+| 事件 | 描述 |
+| ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `mgr.Chatbot.flushed(fn, ···)` | 当打字机效果结束时触发。EventData 为：
- index：当前 message 的 index tuple。
- value：当前 message value。 |
+| `mgr.Chatbot.custom(fn, ···)` | 自定义标签触发事件时触发，EventData 为：
- index：前 message 的 index tuple。
- tag：当前触发的标签。
- tag_index：当前触发标签的 index，此 index 在 mesage 的 index tuple 基础上重新计算。
- value：自定义传入的值。 |
diff --git a/components/Chatbot/README.md b/components/Chatbot/README.md
index 21d1904d6ff739bbe3a81ff3b6a4f0293e64384a..048c83e3f0f79604e02289f14986cf446a3e6c81 100644
--- a/components/Chatbot/README.md
+++ b/components/Chatbot/README.md
@@ -3,10 +3,9 @@
Upgraded gradio Chatbot.
- Supports uniform frontend streaming output of messages
-- Supports output of multimodal content (audio, video, image, text)
-- Built-in tags (chart, select-box, accordion)
+- Supports output of multimodal content (audio, video, voice, files, text)
- Supports multi-agent scenarios
-- Supports custom rendering components and interaction with Python events
+- Supports custom rendering components and interaction with events on the Python side
## How to Use
@@ -49,16 +48,10 @@ Observation:
- When passing a dict, it must include an avatar field.
- When passing a list, it generally corresponds to the multi-bot mode, where each item can receive all the aforementioned values, and each bot’s avatar matches with the position of the bot in the messages. |
-| avatar_image_align | Literal['top', 'middle', 'bottom'] | 'bottom' | Controls the alignment of the avatar with the messages, default is bottom-aligned. |
-| avatar_image_width | int | 45 | The width of the avatar and name. |
-| flushing_speed | int | 3 | Typewriter speed, values range from 1 - 10, with larger values indicating faster speeds. |
-| llm_thinking_presets | list\[dict\] | \[\] | llm thinking link presets, which can convert the output format of llm calling tools into a fixed front-end display format. It needs to be imported from modelscope_studio.Chatbot.llm_thinking_presets, and currently supports: qwen. |
-| custom_components | dict\[str, CustomComponentDict\] CustomComponentDict is defined below | None | Allows users to define custom tags and control tag rendering styles and trigger Python events through JS. |
+| Attribute | Type | Default Value | Description |
+| -------------------- | -------------------------------------------------------------------------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| flushing | bool | True | Whether to enable the typewriter effect. By default, only the bot's messages will have this effect, but you can control the display effect of each message precisely by modifying the flushing attribute of a message individually. |
+| enable_base64 | bool | False | Whether to support rendering content as base64, since rendering base64 is not safe, the default is False. |
+| preview | bool | True | Whether to enable image preview functionality. |
+| avatar_images | tuple\[str \| Path \| None \| dict \| list, str \| Path \| None \| dict\| list\] | None | An extended parameter value for gr.Chatbot, in addition to accepting a URL, it can also accept a dict and list. The dict can include the fields avatar and name, where the name field will be displayed under the avatar when rendered.
- When passing a dict, it must include an avatar field.
- When passing a list, it generally corresponds to the multi-bot mode, where each item can receive all the aforementioned values, and each bot’s avatar matches with the position of the bot in the messages. |
+| avatar_image_align | Literal['top', 'middle', 'bottom'] | 'bottom' | Controls the alignment of the avatar with the messages, default is bottom-aligned. |
+| avatar_image_width | int | 45 | The width of the avatar and name. |
+| flushing_speed | int | 3 | Typewriter speed, values range from 1 - 10, with larger values indicating faster speeds. |
+| llm_thinking_presets | list\[dict\] | \[\] | llm thinking link presets, which can convert the output format of llm calling tools into a fixed front-end display format. It needs to be imported from modelscope_studio.Chatbot.llm_thinking_presets, and currently supports: qwen. |
+| custom_components | dict\[str, CustomComponentDict\] CustomComponentDict is defined below | None | Allows users to define custom tags and control tag rendering styles and trigger Python events through JS. |
**Definition of CustomComponent is as follows:**
@@ -137,7 +122,7 @@ See
- index: The index tuple of the current message.
- value: The current message value. |
-| `mgr.Chatbot.custom(fn, ···)` | Triggered when a custom tag event occurs. EventData is:
- index: The index tuple of the current message ([message index, user group(index 0) or bot group(index 1), user/bot group index]).
- tag: The current tag that triggered the event.
- tag_index: The index of the current triggered tag, re-calculated based on the message’s index tuple.
- value: The custom value passed in. |
+| Event | Description |
+| ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `mgr.Chatbot.flushed(fn, ···)` | Triggered when the typewriter effect ends. EventData is:
- index: The index tuple of the current message.
- value: The current message value. |
+| `mgr.Chatbot.custom(fn, ···)` | Triggered when a custom tag event occurs. EventData is:
- index: The index tuple of the previous message.
- tag: The current tag that triggered the event.
- tag_index: The index of the current triggered tag, re-calculated based on the index tuple of the message.
- value: The custom value passed in. |
diff --git a/components/Chatbot/demos/.DS_Store b/components/Chatbot/demos/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
Binary files /dev/null and b/components/Chatbot/demos/.DS_Store differ
diff --git a/components/Chatbot/demos/accordion.py b/components/Chatbot/demos/accordion.py
index 2f6430bdc6a7143c975a0592b082448dee4bd3ad..ec571ecc489ac6adf0e702cf452faf969de463cd 100644
--- a/components/Chatbot/demos/accordion.py
+++ b/components/Chatbot/demos/accordion.py
@@ -1,13 +1,12 @@
import os
import gradio as gr
-
import modelscope_studio as mgr
from modelscope_studio.components.Chatbot.llm_thinking_presets import qwen
def resolve_assets(relative_path):
- return os.path.join(os.path.dirname(__file__), "../../resources",
+ return os.path.join(os.path.dirname(__file__), "../resources",
relative_path)
@@ -16,13 +15,11 @@ conversation = [
None, {
"text": f"""
Use accordion tag:
-
+
+ `;
+ })
+ .join('')}
+ `;
+ onMount(() => {
+ const inputs = Array.from(el.getElementsByTagName('input'));
+ Array.from(el.getElementsByTagName('label')).forEach((label, i) => {
+ label.addEventListener('click', () => {
+ inputs.forEach((input) => {
+ input.checked = false;
+ });
+ const input = label.getElementsByTagName('input')[0];
+ input.checked = true;
+ // Use cc.dispatch to trigger events.
+ cc.dispatch(options[i]);
+ });
+ });
+ });
+};
diff --git a/components/resources/dog.mp4 b/components/Chatbot/resources/dog.mp4
similarity index 100%
rename from components/resources/dog.mp4
rename to components/Chatbot/resources/dog.mp4
diff --git a/components/resources/image-bot.jpeg b/components/Chatbot/resources/image-bot.jpeg
similarity index 100%
rename from components/resources/image-bot.jpeg
rename to components/Chatbot/resources/image-bot.jpeg
diff --git a/components/resources/music-bot.jpeg b/components/Chatbot/resources/music-bot.jpeg
similarity index 100%
rename from components/resources/music-bot.jpeg
rename to components/Chatbot/resources/music-bot.jpeg
diff --git a/components/resources/screen.jpeg b/components/Chatbot/resources/screen.jpeg
similarity index 100%
rename from components/resources/screen.jpeg
rename to components/Chatbot/resources/screen.jpeg
diff --git a/components/resources/user.jpeg b/components/Chatbot/resources/user.jpeg
similarity index 100%
rename from components/resources/user.jpeg
rename to components/Chatbot/resources/user.jpeg
diff --git a/components/Docs.py b/components/Docs.py
index 71d863bb5d9ed10a6636d868c680ec0651460432..b0932b912662ccf20ce17632fdb37a36d22bd00d 100644
--- a/components/Docs.py
+++ b/components/Docs.py
@@ -3,7 +3,6 @@ import re
from typing import Callable
import gradio as gr
-
import modelscope_studio as mgr
from .parse_markdown import parse_markdown
@@ -49,7 +48,7 @@ def get_demo_modules(file_path: str):
demos = [
demo for demo in list_demos(
os.path.join(os.path.dirname(file_path), "demos"))
- if demo.endswith(".py") and not demo.startswith("__")
+ if demo.endswith(".py")
]
demo_modules = {}
for demo in demos:
@@ -93,41 +92,23 @@ class Docs:
"r") as f:
return f.read()
- def render_demo(self,
- demo_name,
- code_position='left',
- prefix='',
- suffix=''):
+ def render_demo(self, demo_name, prefix='', suffix=''):
content = self.read_file(f"./demos/{demo_name}.py")
module = self.demo_modules[demo_name]
with gr.Accordion("Show Demo", open=False):
-
- def render_code():
- mgr.Markdown(f"""{prefix}
+ with gr.Row():
+ with gr.Column():
+ mgr.Markdown(f"""
+{prefix}
````python
{content}
````
-{suffix}""",
- header_links=True,
- custom_components=custom_components)
-
- if code_position == 'top':
- with gr.Row():
- with gr.Column():
- render_code()
- with gr.Row():
- if code_position == 'left':
- with gr.Column():
- render_code()
+{suffix}
+""",
+ header_links=True,
+ custom_components=custom_components)
with gr.Column():
module.demo.render()
- if code_position == 'right':
- with gr.Column():
- render_code()
- if code_position == 'bottom':
- with gr.Row():
- with gr.Column():
- render_code()
def render_markdown(self,
markdown_file,
@@ -139,16 +120,14 @@ class Docs:
if item["type"] == "text":
md = mgr.Markdown(item["value"],
header_links=True,
- custom_components=custom_components,
- preview=False)
+ custom_components=custom_components)
deps = [dep for dep in [components_tabs, self.tabs] if dep]
if len(deps) > 0:
md.custom(fn=on_tab_link_click, outputs=deps)
elif item["type"] == "demo":
self.render_demo(item["name"],
prefix=item["prefix"],
- suffix=item["suffix"],
- code_position=item["code_position"])
+ suffix=item["suffix"])
def render(self, components_tabs=None):
diff --git a/components/Flow/README-zh_CN.md b/components/Flow/README-zh_CN.md
deleted file mode 100644
index 0c4afb7e97c43aaa3d69acdaacdae787a32d4892..0000000000000000000000000000000000000000
--- a/components/Flow/README-zh_CN.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# Flow
-
-基于 [reactflow](https://reactflow.dev/) 实现的 Flow 组件。
-
-- 支持通过 schema 自定义渲染节点
-- 支持自定义节点的渲染组件，并与 Python 事件交互
-
-## 如何使用
-
-### 定义 schema 节点 (重要)
-
-详见：
- id：当前触发节点 id。
- node：当前触发节点类型。
- attr：当前触发节点属性。
- index：当前触发节点属性索引，当节点属性为 list 时有值。
- value：自定义传入的值。 |
diff --git a/components/Flow/README.md b/components/Flow/README.md
deleted file mode 100644
index b7ebf875a609b8127407d48177bb836b692f4d46..0000000000000000000000000000000000000000
--- a/components/Flow/README.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# Flow
-
-A Flow component implemented based on [reactflow](https://reactflow.dev/).
-
-- Supports customization of node rendering through a schema.
-- Allows for custom node render components with interaction from Python.
-
-## How to Use
-
-### Defining Schema Nodes (Important)
-
-See:
- `id`: ID of the currently triggered node.
- `node`: Type of the currently triggered node.
- `attr`: Attributes of the currently triggered node.
- `index`: Index of the attribute if it's a list.
- `value`: Custom passed-in value. |
diff --git a/components/Flow/app.py b/components/Flow/app.py
deleted file mode 100644
index 77372ef291165f2cf77a8944f3f8b18773972190..0000000000000000000000000000000000000000
--- a/components/Flow/app.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from components.Docs import Docs
-
-docs = Docs(__file__)
-
-if __name__ == "__main__":
- docs.render().queue().launch()
diff --git a/components/Flow/define_schema-zh_CN.md b/components/Flow/define_schema-zh_CN.md
deleted file mode 100644
index dfd15303d31764b01c8170275d0d91b43f61dfe5..0000000000000000000000000000000000000000
--- a/components/Flow/define_schema-zh_CN.md
+++ /dev/null
@@ -1,266 +0,0 @@
-# Define Schema
-
-在使用 Flow 组件前，需要预先创建 Schema 定义 node 节点，schema 类型定义如下：
-
-```ts
-export interface FlowSchema {
- nodes: FlowNodeSchema[];
-}
-
-export interface FlowNodeSchema {
- /**
- * 作为节点的唯一标识。必填。
- */
- name: string;
-
- /**
- * 节点显示图标。
- */
- icon?: string;
-
- /**
- * 节点标题，如果没有提供则默认使用 name。
- */
- title?: string;
-
- /**
- * 节点的简短描述。
- */
- description?: string;
-
- /**
- * 节点宽度。
- */
- width?: number;
-
- /**
- * 节点高度。
- */
- height?: number;
-
- /**
- * 显示/隐藏工具栏（删除、复制、重命名等）。
- * @default true
- */
- show_toolbar?: boolean;
-
- /**
- * 启用/禁止添加更多此类节点实例。
- * @default true
- */
- addable?: boolean;
-
- /**
- * 启用/禁止删除现有此类节点实例。
- * @default true
- */
- deletable?: boolean;
-
- /**
- * 可以同时存在的此类节点的最大数量。
- */
- max?: number;
-
- /**
- * 可以同时存在的此类节点的最小数量。
- */
- min?: number;
-
- /**
- * 节点连接端口的配置。
- */
- ports?: {
- /**
- * 节点作为连接的源端口。
- * @default ['right']
- */
- source?: Position[];
-
- /**
- * 允许此节点 source 端口连接到的其他节点或属性。默认为所有节点和属性。
- * @default []
- */
- sourceConnections?: PortConnection[];
-
- /**
- * 节点作为连接的目标端口。
- * @default ['left']
- */
- target?: Position[];
-
- /**
- * 其他允许连接到此节点 target 端口的节点或属性。默认为所有节点和属性
- * @default []
- */
- targetConnections?: PortConnection[];
- };
-
- /**
- * 节点的属性配置。
- */
- attrs?: FlowNodeAttrSchema[];
-
- /**
- * 创建新实例时节点属性的初始值。
- */
- template?: {
- /**
- * 在`attrs`字段中与其名称相对应的属性值，例如 { "a": 1, "b": 2 }。
- */
- attrs?: Attrs;
- };
-}
-
-export interface FlowNodeAttrSchema {
- /**
- * 唯一的属性名称，在 node data 中用作 key。必填。
- */
- name: string;
-
- /**
- * 属性标题，如果没有提供则默认使用 name。
- */
- title?: string;
-
- /**
- * 属性的简短描述
- */
- description?: string;
-
- /**
- * 禁用用户编辑属性值。默认情况下，属性是可编辑的。
- * @default false
- */
- disabled?: boolean;
-
- /**
- * 属性输入类型。可以是内置的 Ant Design 组件或自定义组件之一。默认为'input'。
- * @default 'input'
- */
- type?:
- | 'input'
- | 'textarea'
- | 'radio'
- | 'checkbox'
- | 'number'
- | 'select'
- | 'switch'
- | 'upload'
- // 自定义
- | (string & {});
-
- /**
- * 针对所选组件类型的特定配置选项，支持 Ant Design 组件({@link https://ant.design/components/overview/})或自定义组件的属性。
- */
- props?: Record
- tag_index：当前触发标签的 index。
- value：自定义传入的值。 |
+| 事件 | 描述 |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `mgr.Markdown.custom(fn, ···)` | 自定义标签触发事件时触发，EventData 为：
- index：当前 message 的 index tuple ([message index, user group(index 0) or bot group(index 1), user/bot group index])。
- tag：当前触发的标签。
- tag_index：当前触发标签的 index，此 index 在 mesage 的 index tuple 基础上重新计算。
- value：自定义传入的值。 |
diff --git a/components/Markdown/README.md b/components/Markdown/README.md
index 9a705158481c04a05043a751f081e737a64f9bea..14f01cc05a494b9a1f0dcd52cc5ba9cf4bfb6e05 100644
--- a/components/Markdown/README.md
+++ b/components/Markdown/README.md
@@ -2,9 +2,8 @@
Upgraded gradio Markdown.
-- Supports output of multimodal content (audio, video, image, text)
-- Built-in tags (chart, select-box, accordion)
-- Supports custom rendering components and interaction with Python events
+- Supports output of multimodal content (audio, video, voice, files, text)
+- Supports custom rendering components and interaction with Python-side events
## How to Use
@@ -18,24 +17,19 @@ Upgraded gradio Markdown.
### Support for Accordion Content Display
-Include the `accordion` tag in the returned content. For more usage details, see
- tag: The current tag that triggered the event.
- tag_index: The index of the current triggered tag.
- value: The custom value passed in. |
+| Event | Description |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `mgr.Markdown.custom(fn, ···)` | Triggered when a custom tag event occurs. EventData is:
- index: The index tuple of the current message ([message index, user group(index 0) or bot group(index 1), user/bot group index]).
- tag: The current tag that triggered the event.
- tag_index: The index of the current triggered tag, re-calculated based on the message’s index tuple.
- value: The custom value passed in. |
diff --git a/components/Markdown/custom_tags/chart-zh_CN.md b/components/Markdown/custom_tags/chart-zh_CN.md
deleted file mode 100644
index caca68a9e3ef4b4d7a83320cfef55fb48968ed9c..0000000000000000000000000000000000000000
--- a/components/Markdown/custom_tags/chart-zh_CN.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# chart
-
-在 markdown 文本中添加图表。
-
-## 如何使用
-
-### 基本使用
-
-
+
+ `;
+ })
+ .join('')}
+ `;
+ onMount(() => {
+ const inputs = Array.from(el.getElementsByTagName('input'));
+ Array.from(el.getElementsByTagName('label')).forEach((label, i) => {
+ label.addEventListener('click', () => {
+ inputs.forEach((input) => {
+ input.checked = false;
+ });
+ const input = label.getElementsByTagName('input')[0];
+ input.checked = true;
+ // Use cc.dispatch to trigger events.
+ cc.dispatch(options[i]);
+ });
+ });
+ });
+};
diff --git a/components/Markdown/resources/dog.mp4 b/components/Markdown/resources/dog.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..062b9c81317de43f392c56e9e03444bf8cc31d51
--- /dev/null
+++ b/components/Markdown/resources/dog.mp4
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39d086ce29e48cf76e5042d2f3f0611ee46575f70fa3dc0c40dd4cfffde3d933
+size 8626383
diff --git a/components/Markdown/resources/screen.jpeg b/components/Markdown/resources/screen.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..574735acb117e86c5c0850e2b5489b8f8efa20cc
Binary files /dev/null and b/components/Markdown/resources/screen.jpeg differ
diff --git a/components/Markdown/resources/user.jpeg b/components/Markdown/resources/user.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..536948b6bd19cb0b49c44b74e2790198301520e5
Binary files /dev/null and b/components/Markdown/resources/user.jpeg differ
diff --git a/components/MultimodalInput/README.md b/components/MultimodalInput/README.md
index e82c502fd4b3ae76deb07aeed336389461442102..b3e1441b24f985bd555561f1384680efcaae6ba5 100644
--- a/components/MultimodalInput/README.md
+++ b/components/MultimodalInput/README.md
@@ -43,7 +43,7 @@ class MultimodalInputData(GradioModel):
| Attribute | Type | Default Value | Description |
| ------------------- | ----------------------------------------------- | ------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| sources | List[Literal['upload', 'microphone', 'webcam']] | ['upload'] | A list of types for uploading files. "upload" provides an upload file button. "microphone" supports user audio input. "webcam" supports user photography to generate images or videos. |
+| sources | list[Literal['upload', 'microphone', 'webcam']] | ['upload'] | A list of types for uploading files. "upload" provides an upload file button. "microphone" supports user audio input. "webcam" supports user photography to generate images or videos. |
| webcam_props | dict | None | webcam component properties, currently supports passing mirror_webcam(bool), include_audio(bool) |
| upload_button_props | dict | None | Upload file button properties, same as gradio UploadButton |
| submit_button_props | dict | None | Submit button properties, same as gradio Button |
diff --git a/components/MultimodalInput/demos/basic.py b/components/MultimodalInput/demos/basic.py
index 67d7470d29e8d017e88884a9b2783b529f1930d8..55249c4b3433c88a1575c13f6ab75910b8bab35b 100644
--- a/components/MultimodalInput/demos/basic.py
+++ b/components/MultimodalInput/demos/basic.py
@@ -1,5 +1,4 @@
import gradio as gr
-
import modelscope_studio as mgr
diff --git a/components/MultimodalInput/demos/config_buttons.py b/components/MultimodalInput/demos/config_buttons.py
index 493c59a64404a565102c57eb373d851a5702c04b..6b73382be2cc6dba792cd0275e8a668d08c21d05 100644
--- a/components/MultimodalInput/demos/config_buttons.py
+++ b/components/MultimodalInput/demos/config_buttons.py
@@ -1,5 +1,4 @@
import gradio as gr
-
import modelscope_studio as mgr
diff --git a/components/MultimodalInput/demos/upload_sources.py b/components/MultimodalInput/demos/upload_sources.py
index 2e9b5476fdce7d83ee4b9e2f47de91f18a7e42bd..e9caff69a0791dde1583d8cb6069765066c79955 100644
--- a/components/MultimodalInput/demos/upload_sources.py
+++ b/components/MultimodalInput/demos/upload_sources.py
@@ -1,5 +1,4 @@
import gradio as gr
-
import modelscope_studio as mgr
diff --git a/components/MultimodalInput/demos/with_chatbot.py b/components/MultimodalInput/demos/with_chatbot.py
index 6ad7784a434bb224edf30b0dcd4e668f43e7de4e..fe48acad1ea0cae316ce54468659e7c345f247fb 100644
--- a/components/MultimodalInput/demos/with_chatbot.py
+++ b/components/MultimodalInput/demos/with_chatbot.py
@@ -1,7 +1,6 @@
import time
import gradio as gr
-
import modelscope_studio as mgr
diff --git a/components/WaterfallGallery/README-zh_CN.md b/components/WaterfallGallery/README-zh_CN.md
deleted file mode 100644
index 94552d6c36dc16a3717e9ff437ddb441bc7788dc..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/README-zh_CN.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# WaterfallGallery
-
-瀑布流形式的 gradio Gallery。
-
-- 支持瀑布流展示图片
-- 增加点赞按钮，支持图片额外绑定`like`事件
-- 增加 action 按钮，支持图片额外绑定`click`事件
-- 响应式 columns
-
-## 如何使用
-
-### 基本使用
-
-
- 如果传入 int, 则应用于所有尺寸屏幕；
- 如果传入 tuple, 当给出的断点少于 6 个, 则最后一个断点将用于所有后续断点；
- 如果传入 dict, 则可以以 [xs,sm,md,lg,xl,xll] 为键表示每个尺寸屏幕的图像数量。 |
-| gap | tuple \| int | 8 | 图片之间的间隙 (px)。 如果传递一个元组，则第一个值是宽度的间隙，第二个值是高度的间隙。如果传递数字，则宽度和高度的间隙相同 |
-| action_label | str | 'Click' | action 按钮的文案。当 `clickable`为 True 时才展示 |
-| likeable | bool | None | 是否显示喜欢或不喜欢按钮。 可以通过显示绑定 `.like` 方法自动设置。 |
-| clickable | bool | None | 是否显示 action 按钮。 可以通过显示绑定 `.click` 方法自动设置。 |
-
-### event listeners
-
-| 事件 | 描述 |
-| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `mgr.WaterfallGallery.load_more(fn, ···)` | “加载更多”按钮被点击时触发。 |
-| `mgr.WaterfallGallery.like(fn, ···)` | 当点赞/点踩按钮被点击时触发，EventData 为：
- index：当前图片索引。
- value：当前图片信息。
- liked：当前图片的喜欢/不喜欢状态，可以为 None，代表用户取消操作。 |
-| `mgr.WaterfallGallery.click(fn, ···)` | action 按钮被点击时触发，EventData 为：
- index：当前图片索引。
- value：当前图片信息。 |
diff --git a/components/WaterfallGallery/README.md b/components/WaterfallGallery/README.md
deleted file mode 100644
index 392fe320a45a75d44b8f0111deb73e4a1021da23..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# WaterfallGallery
-
-gradio Gallery with waterfall flow.
-
-- Support waterfall flow display images
-- Added a like button, support additional binding of `like` events to images
-- Added an action button, support additional binding of `click` event to images
-- Responsive columns
-
-## How to Use
-
-### Basic Usage
-
-
- If int is passed in, it will apply to all screen sizes;
- If tuple is passed in, when less than 6 breakpoints are given, the last breakpoint will be used for all subsequent breakpoints ;
- If a dict is passed in, you can represents the number of images for each size screen with [xs,sm,md,lg,xl,xll] as the key. |
-| gap | tuple \| int | 8 | The gap (px) between images. If a tuple is passed, the first value is the gap for width and the second value is the gap for height.If a number is passed, the gap will be the same for width and height. |
-| action_label | str | 'Click' | The label for the action button. Only displayed if `clickable` is set to True. |
-| likeable | bool | None | Whether the gallery image display a like or dislike button. Set automatically by the .like method but has to be present in the signature for it to show up in the config. |
-| clickable | bool | None | Whether the gallery image display an action button. Set automatically by the .click method but has to be present in the signature for it to show up in the config. |
-
-### Event Listeners
-
-| Event | Description |
-| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `mgr.WaterfallGallery.load_more(fn, ···)` | Triggered when the "Load More" button is clicked. |
-| `mgr.WaterfallGallery.like(fn, ···)` | Triggered when the Like/Dislike button is clicked. EventData is:
- index: current image index.
- value: current image info.
- liked: like/dislike status of the current image, which can be None, indicating that the user cancels the operation. |
-| `mgr.WaterfallGallery.click(fn, ···)` | Triggered when the action button is clicked, EventData is:
- index: current image index.
- value: current image info. |
diff --git a/components/WaterfallGallery/app.py b/components/WaterfallGallery/app.py
deleted file mode 100644
index 77372ef291165f2cf77a8944f3f8b18773972190..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/app.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from components.Docs import Docs
-
-docs = Docs(__file__)
-
-if __name__ == "__main__":
- docs.render().queue().launch()
diff --git a/components/WaterfallGallery/demos/basic.py b/components/WaterfallGallery/demos/basic.py
deleted file mode 100644
index 7f1c2760d3fe8fa1ac7c0adaa2cfa9997ccf9656..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/demos/basic.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import os
-
-import gradio as gr
-
-import modelscope_studio as mgr
-
-
-def resolve_assets(relative_path):
- return os.path.join(os.path.dirname(__file__), "../../resources",
- relative_path)
-
-
-with gr.Blocks() as demo:
- mgr.WaterfallGallery(
- value=[
- resolve_assets('modelscope.svg'),
- # pass a tuple
- [resolve_assets('bot.jpeg'), 'bot'],
- # pass a dict
- {
- "image": resolve_assets('user.jpeg'),
- "caption": "user",
- },
- resolve_assets('screen.jpeg'),
- ],
- columns=2,
- height=600)
-
-if __name__ == "__main__":
- demo.queue().launch()
diff --git a/components/WaterfallGallery/demos/like_click_feedback.py b/components/WaterfallGallery/demos/like_click_feedback.py
deleted file mode 100644
index 10e2c37d48039530b76de3b689b1439dc34d25d8..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/demos/like_click_feedback.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-
-import gradio as gr
-
-import modelscope_studio as mgr
-
-
-def resolve_assets(relative_path):
- return os.path.join(os.path.dirname(__file__), "../../resources",
- relative_path)
-
-
-def fn(data: gr.EventData):
- print(data._data)
-
-
-with gr.Blocks() as demo:
- gallery = mgr.WaterfallGallery(
- value=[
- resolve_assets('modelscope.svg'),
- # pass a tuple
- [resolve_assets('bot.jpeg'), 'bot'],
- # pass a dict
- {
- "image": resolve_assets('user.jpeg'),
- "caption": "user",
- },
- resolve_assets('screen.jpeg'),
- ],
- action_label="Click Me!",
- columns=2,
- height=600)
- gallery.like(fn=fn)
- gallery.click(fn=fn)
-
-if __name__ == "__main__":
- demo.queue().launch()
diff --git a/components/WaterfallGallery/demos/load_more.py b/components/WaterfallGallery/demos/load_more.py
deleted file mode 100644
index a6a23e7814d11138ff3b1a03843ac0fe31cd77f5..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/demos/load_more.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import os
-import time
-
-import gradio as gr
-
-import modelscope_studio as mgr
-
-
-def resolve_assets(relative_path):
- return os.path.join(os.path.dirname(__file__), "../../resources",
- relative_path)
-
-
-def load_more(_gallery):
- time.sleep(1)
- _gallery.append(resolve_assets('modelscope.svg'))
- _gallery.append(resolve_assets('bot.jpeg'))
- _gallery.append(resolve_assets('user.jpeg'))
- _gallery.append(resolve_assets('screen.jpeg'))
- has_more = True
- if (len(_gallery) > 10):
- has_more = False
- return gr.update(value=_gallery, has_more=has_more)
-
-
-with gr.Blocks() as demo:
- gallery = mgr.WaterfallGallery(
- value=[
- resolve_assets('modelscope.svg'),
- # pass a tuple
- [resolve_assets('bot.jpeg'), 'bot'],
- # pass a dict
- {
- "image": resolve_assets('user.jpeg'),
- "caption": "user",
- },
- resolve_assets('screen.jpeg'),
- ],
- has_more=True,
- columns=2,
- height=600)
- gallery.load_more(fn=load_more, inputs=[gallery], outputs=[gallery])
-
-if __name__ == "__main__":
- demo.queue().launch()
diff --git a/components/WaterfallGallery/demos/responsive_columns.py b/components/WaterfallGallery/demos/responsive_columns.py
deleted file mode 100644
index f6bded307dc9568f0ecb169ac28d2c2a37b6cdd1..0000000000000000000000000000000000000000
--- a/components/WaterfallGallery/demos/responsive_columns.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import os
-
-import gradio as gr
-
-import modelscope_studio as mgr
-
-
-def resolve_assets(relative_path):
- return os.path.join(os.path.dirname(__file__), "../../resources",
- relative_path)
-
-
-def fn():
- return gr.update(columns={"xs": 2, "lg": 3})
-
-
-with gr.Blocks() as demo:
- gallery = mgr.WaterfallGallery(
- value=[
- resolve_assets('modelscope.svg'),
- # pass a tuple
- [resolve_assets('bot.jpeg'), 'bot'],
- # pass a dict
- {
- "image": resolve_assets('user.jpeg'),
- "caption": "user",
- },
- resolve_assets('screen.jpeg'),
- ],
- columns=[2, 3, 4],
- height=600)
- gr.Button("Update Columns").click(fn=fn, outputs=[gallery])
-
-if __name__ == "__main__":
- demo.queue().launch()
diff --git a/components/parse_markdown.py b/components/parse_markdown.py
index 56074f51585def881aa974994f2fa944c335c8ac..7f2bc78d3b0f241ecb930d43e6f787c8e6a14413 100644
--- a/components/parse_markdown.py
+++ b/components/parse_markdown.py
@@ -42,16 +42,10 @@ class MarkdownParser(HTMLParser):
return
if tag == "demo":
self.value.append({
- "type":
- "demo",
- "code_position":
- dict(attrs).get("code-position", 'left'),
- "name":
- dict(attrs)["name"],
- "prefix":
- "",
- "suffix":
- ""
+ "type": "demo",
+ "name": dict(attrs)["name"],
+ "prefix": "",
+ "suffix": ""
})
elif tag == "file":
content = self.read_file(dict(attrs)["src"])
diff --git a/components/resources/custom_components/custom_select.js b/components/resources/custom_components/custom_select.js
deleted file mode 100644
index f4a1cb405ae5efb33e31990018b2beac5ac26aa3..0000000000000000000000000000000000000000
--- a/components/resources/custom_components/custom_select.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(props, cc, { el, onUpdate }) => {
- const options = JSON.parse(props.options);
- el.innerHTML = `
- ${options
- .map((option) => {
- return `
-
- `;
- })
- .join('')}
- `;
- onUpdate(
- () => {
- const inputs = Array.from(el.getElementsByTagName('input'));
- Array.from(el.getElementsByTagName('label')).forEach((label, i) => {
- label.addEventListener('click', () => {
- inputs.forEach((input) => {
- input.checked = false;
- });
- const input = label.getElementsByTagName('input')[0];
- input.checked = true;
- // Use cc.dispatch to trigger events.
- cc.dispatch(options[i]);
- });
- });
- },
- { callAfterMount: true }
- );
-};
diff --git a/components/resources/modelscope.svg b/components/resources/modelscope.svg
deleted file mode 100644
index 093ba6fe2a55a9b6c5f5105af9f3544d60429e7b..0000000000000000000000000000000000000000
--- a/components/resources/modelscope.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modelscope_gradio_components-0.0.1b8-py3-none-any.whl b/modelscope_gradio_components-0.0.1b8-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..9c3d9ef66b7f3a2ba4ec3cfd3b857652a085bc38
--- /dev/null
+++ b/modelscope_gradio_components-0.0.1b8-py3-none-any.whl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:315cf0dc047cec535dc3b57706891c404620cdff32fe8feb4b013e771e72e512
+size 6260465
diff --git a/modelscope_studio-0.4.0-py3-none-any.whl b/modelscope_studio-0.4.0-py3-none-any.whl
deleted file mode 100644
index ccb59b4d59e5b0ea55c7964f1274c03d53ada899..0000000000000000000000000000000000000000
--- a/modelscope_studio-0.4.0-py3-none-any.whl
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ea6dc30b6a751eff8b0e7e99554af09ad2b6d13841e8896e5e5af544d9425b7
-size 10995416
diff --git a/requirements.txt b/requirements.txt
index b4f81f0ed622406099117d2b1b10d1cefd1cb6ba..dfb99a6639e934d38ae5936d16c84f2cd69e6ab3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
modelscope_studio
-modelscope_studio-0.4.0-py3-none-any.whl
diff --git a/src/pyproject.toml b/src/pyproject.toml
index 016557687e30cf6dd83ea619b814ee3c44d301a6..c83b7c0f722fe53f85a4119337e1f431a3f35a6b 100644
--- a/src/pyproject.toml
+++ b/src/pyproject.toml
@@ -8,15 +8,15 @@ build-backend = "hatchling.build"
[project]
name = "modelscope_studio"
-version = "0.1.7"
-description = "A set of extension component, inluding components for conversational input and display in multimodal scenarios, as well as more components for vertical scenarios."
+version = "0.0.1-beta.8"
+description = "A set of extension component libraries based on gradio 4.x, mainly focuses on enhancing conversational scenarios, supporting multimodal contexts, and providing assistance for various other specialized scenarios."
readme = "README.md"
license = "Apache-2.0"
requires-python = ">=3.8"
authors = [{ name = "YOUR NAME", email = "YOUREMAIL@domain.com" }]
keywords = [
- "gradio-custom-component",
- "modelscope-studio",
+ "gradio-custom-component",
+ "modelscope-gradio-components",
"gradio-template-Chatbot",
]
# Add dependencies here
@@ -41,17 +41,16 @@ dev = ["build", "twine"]
[tool.hatch.build]
artifacts = [
- "*.pyi",
- "backend/modelscope_studio/components/Chatbot/templates",
- "backend/modelscope_studio/components/MultimodalInput/templates",
- "backend/modelscope_studio/components/Markdown/templates",
- "backend/modelscope_studio/components/WaterfallGallery/templates",
+ "backend/modelscope_gradio_components/components/Chatbot/templates",
+ "backend/modelscope_gradio_components/components/MultimodalInput/templates",
+ "backend/modelscope_gradio_components/components/Markdown/templates",
+ "backend/modelscope_gradio_components/components/Chatbot/templates",
+ "backend/modelscope_gradio_components/components/Markdown/templates",
+ "backend/modelscope_gradio_components/components/MultimodalInput/templates",
]
[tool.hatch.build.targets.sdist]
-exclude = ["__pycache__"]
-include = ["/backend/modelscope_studio"]
+include = ["/backend/modelscope_gradio_components"]
[tool.hatch.build.targets.wheel]
-packages = ["/backend/modelscope_studio"]
-exclude = ["__pycache__"]
+packages = ["/backend/modelscope_gradio_components"]