modelscope-studio 1.5.0__tar.gz → 1.5.1__tar.gz

{modelscope_studio-1.5.0 → modelscope_studio-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelscope_studio
-Version: 1.5.0
+Version: 1.5.1
 Summary: A third-party component library based on Gradio.
 Author-email: ModelScope team <contact@modelscope.cn>
 License-Expression: Apache-2.0

{modelscope_studio-1.5.0 → modelscope_studio-1.5.1}/backend/modelscope_studio/utils/dev/component.py

@@ -1,8 +1,11 @@
+import inspect
 from timeit import Timer
 from typing import Any, Callable, List, Set, Union
 
+import gradio
 from gradio.component_meta import ComponentMeta
 from gradio.components.base import BlockContext, Component
+from packaging import version
 
 from .app_context import AppContext
 
@@ -16,6 +19,10 @@ class ModelScopeLayoutComponent(BlockContext, metaclass=ComponentMeta):
     # supported slots
     SLOTS = []
 
+    @property
+    def skip_api(self):
+        return True
+
     def __exit__(self, *args, **kwargs):
         self._internal.update(layout=True)
         super().__exit__(*args, **kwargs)
@@ -45,14 +52,24 @@ class ModelScopeLayoutComponent(BlockContext, metaclass=ComponentMeta):
 
         self.elem_style = elem_style
 
-    @property
-    def skip_api(self):
-        return True
-
 
 class ModelScopeComponent(Component):
     """
     """
+    EVENTS = []
+
+    @property
+    def skip_api(self):
+        return False
+
+    def api_info(self):
+        if version.Version(gradio.__version__) >= version.Version("5.49.0"):
+            return super().api_info()
+
+        if hasattr(self, "_api_info"):
+            return self._api_info
+        self._api_info = super().api_info()
+        return self._api_info
 
     def __init__(
             self,
@@ -92,15 +109,21 @@ class ModelScopeComponent(Component):
         self.elem_style = elem_style
 
 
-class ModelScopeDataLayoutComponent(Component,
+# MRO
+class ModelScopeDataLayoutComponent(ModelScopeComponent,
                                     BlockContext,
                                     metaclass=ComponentMeta):
     """
     """
     EVENTS = []
+
     # supported slots
     SLOTS = []
 
+    @property
+    def skip_api(self):
+        return False
+
     # fix gradio's bug
     @property
     def component_class_id(self):
@@ -110,10 +133,6 @@ class ModelScopeDataLayoutComponent(Component,
     def component_class_id(self, value):
         pass
 
-    @property
-    def skip_api(self):
-        return False
-
     def __exit__(self, *args, **kwargs):
         self._internal.update(layout=True)
         super().__exit__(*args, **kwargs)
@@ -123,7 +142,6 @@ class ModelScopeDataLayoutComponent(Component,
             value: Any = None,
             *,
             as_item: Union[str, None] = None,
-            _internal: None = None,
             # gradio properties
             visible: bool = True,
             elem_id: Union[str, None] = None,
@@ -141,23 +159,29 @@ class ModelScopeDataLayoutComponent(Component,
             value=value,
             elem_id=elem_id,
             elem_classes=elem_classes,
+            elem_style=elem_style,
             key=key,
             every=every,
             inputs=inputs,
             load_fn=load_fn,
+            as_item=as_item,
             # disable render twice
             render=False,
             **kwargs)
-        BlockContext.__init__(self,
-                              visible=visible,
-                              elem_id=elem_id,
-                              elem_classes=elem_classes,
-                              render=render)
-        AppContext.assert_app()
-
-        if self.parent:
-            self._internal = dict(index=len(self.parent.children) - 1)
+        sig = inspect.signature(BlockContext.__init__)
+        has_preserved_by_key_parameter = "preserved_by_key" in sig.parameters
+        if has_preserved_by_key_parameter:
+            preserved_by_key = kwargs.get("preserved_by_key", "value")
+            BlockContext.__init__(self,
+                                  visible=visible,
+                                  elem_id=elem_id,
+                                  elem_classes=elem_classes,
+                                  render=render,
+                                  key=key,
+                                  preserved_by_key=preserved_by_key)
         else:
-            self._internal = dict()
-        self.as_item = as_item
-        self.elem_style = elem_style
+            BlockContext.__init__(self,
+                                  visible=visible,
+                                  elem_id=elem_id,
+                                  elem_classes=elem_classes,
+                                  render=render)

{modelscope_studio-1.5.0 → modelscope_studio-1.5.1}/backend/modelscope_studio/utils/dev/component.pyi

@@ -1,8 +1,11 @@
+import inspect
 from timeit import Timer
 from typing import Any, Callable, List, Set, Union
 
+import gradio
 from gradio.component_meta import ComponentMeta
 from gradio.components.base import BlockContext, Component
+from packaging import version
 
 from .app_context import AppContext
 
@@ -17,6 +20,10 @@ class ModelScopeLayoutComponent(BlockContext, metaclass=ComponentMeta):
     # supported slots
     SLOTS = []
 
+    @property
+    def skip_api(self):
+        return True
+
     def __exit__(self, *args, **kwargs):
         self._internal.update(layout=True)
         super().__exit__(*args, **kwargs)
@@ -45,10 +52,6 @@ class ModelScopeLayoutComponent(BlockContext, metaclass=ComponentMeta):
             self._internal = dict()
 
         self.elem_style = elem_style
-
-    @property
-    def skip_api(self):
-        return True
     from typing import Callable, Literal, Sequence, Any, TYPE_CHECKING
     from gradio.blocks import Block
     if TYPE_CHECKING:
@@ -59,6 +62,20 @@ class ModelScopeLayoutComponent(BlockContext, metaclass=ComponentMeta):
 class ModelScopeComponent(Component):
     """
     """
+    EVENTS = []
+
+    @property
+    def skip_api(self):
+        return False
+
+    def api_info(self):
+        if version.Version(gradio.__version__) >= version.Version("5.49.0"):
+            return super().api_info()
+
+        if hasattr(self, "_api_info"):
+            return self._api_info
+        self._api_info = super().api_info()
+        return self._api_info
 
     def __init__(
             self,
@@ -103,15 +120,21 @@ class ModelScopeComponent(Component):
         from gradio.components.base import Component
 
 
-class ModelScopeDataLayoutComponent(Component,
+# MRO
+class ModelScopeDataLayoutComponent(ModelScopeComponent,
                                     BlockContext,
                                     metaclass=ComponentMeta):
     """
     """
     EVENTS = []
+
     # supported slots
     SLOTS = []
 
+    @property
+    def skip_api(self):
+        return False
+
     # fix gradio's bug
     @property
     def component_class_id(self):
@@ -121,10 +144,6 @@ class ModelScopeDataLayoutComponent(Component,
     def component_class_id(self, value):
         pass
 
-    @property
-    def skip_api(self):
-        return False
-
     def __exit__(self, *args, **kwargs):
         self._internal.update(layout=True)
         super().__exit__(*args, **kwargs)
@@ -134,7 +153,6 @@ class ModelScopeDataLayoutComponent(Component,
             value: Any = None,
             *,
             as_item: Union[str, None] = None,
-            _internal: None = None,
             # gradio properties
             visible: bool = True,
             elem_id: Union[str, None] = None,
@@ -152,26 +170,32 @@ class ModelScopeDataLayoutComponent(Component,
             value=value,
             elem_id=elem_id,
             elem_classes=elem_classes,
+            elem_style=elem_style,
             key=key,
             every=every,
             inputs=inputs,
             load_fn=load_fn,
+            as_item=as_item,
             # disable render twice
             render=False,
             **kwargs)
-        BlockContext.__init__(self,
-                              visible=visible,
-                              elem_id=elem_id,
-                              elem_classes=elem_classes,
-                              render=render)
-        AppContext.assert_app()
-
-        if self.parent:
-            self._internal = dict(index=len(self.parent.children) - 1)
+        sig = inspect.signature(BlockContext.__init__)
+        has_preserved_by_key_parameter = "preserved_by_key" in sig.parameters
+        if has_preserved_by_key_parameter:
+            preserved_by_key = kwargs.get("preserved_by_key", "value")
+            BlockContext.__init__(self,
+                                  visible=visible,
+                                  elem_id=elem_id,
+                                  elem_classes=elem_classes,
+                                  render=render,
+                                  key=key,
+                                  preserved_by_key=preserved_by_key)
         else:
-            self._internal = dict()
-        self.as_item = as_item
-        self.elem_style = elem_style
+            BlockContext.__init__(self,
+                                  visible=visible,
+                                  elem_id=elem_id,
+                                  elem_classes=elem_classes,
+                                  render=render)
     from typing import Callable, Literal, Sequence, Any, TYPE_CHECKING
     from gradio.blocks import Block
     if TYPE_CHECKING:

modelscope_studio-1.5.1/backend/modelscope_studio/version.py

@@ -0,0 +1 @@
+__version__ = "1.5.1"

{modelscope_studio-1.5.0 → modelscope_studio-1.5.1}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "modelscope_studio"
-version = "1.5.0"
+version = "1.5.1"
 description = "A third-party component library based on Gradio."
 readme = "README.md"
 license = "Apache-2.0"

modelscope_studio-1.5.0/backend/modelscope_studio/version.py

@@ -1 +0,0 @@
-__version__ = "1.5.0"