From 7ea8336709726dbe14dd00303fe2db3fe27f0502 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 1 Feb 2024 22:24:26 +0200 Subject: [PATCH] Remove flag_dir from read_from_flag() (#7059) * Remove flag_dir from read_from_flag() * fix * remove unnecessary ruff exception --------- Co-authored-by: Abubakar Abid --- .changeset/slow-bikes-thank.md | 5 +++++ gradio/components/base.py | 12 ++---------- gradio/components/json_component.py | 2 +- gradio/components/state.py | 2 +- gradio/helpers.py | 7 +------ guides/05_custom-components/04_backend.md | 1 - 6 files changed, 10 insertions(+), 19 deletions(-) create mode 100644 .changeset/slow-bikes-thank.md diff --git a/.changeset/slow-bikes-thank.md b/.changeset/slow-bikes-thank.md new file mode 100644 index 000000000000..ee82007f078b --- /dev/null +++ b/.changeset/slow-bikes-thank.md @@ -0,0 +1,5 @@ +--- +"gradio": minor +--- + +feat:Remove flag_dir from read_from_flag() diff --git a/gradio/components/base.py b/gradio/components/base.py index 2d3a43fa4d33..b86d02273a3e 100644 --- a/gradio/components/base.py +++ b/gradio/components/base.py @@ -99,11 +99,7 @@ def flag(self, payload: Any | GradioDataModel, flag_dir: str | Path = "") -> str pass @abstractmethod - def read_from_flag( - self, - payload: Any, - flag_dir: str | Path | None = None, - ) -> GradioDataModel | Any: + def read_from_flag(self, payload: Any) -> GradioDataModel | Any: """ Convert the data from the csv or jsonl file into the component state. """ @@ -286,11 +282,7 @@ def flag(self, payload: Any, flag_dir: str | Path = "") -> str: return payload.copy_to_dir(flag_dir).model_dump_json() return payload - def read_from_flag( - self, - payload: Any, - flag_dir: str | Path | None = None, # noqa: ARG002 - ): + def read_from_flag(self, payload: Any): """ Convert the data from the csv or jsonl file into the component state. """ diff --git a/gradio/components/json_component.py b/gradio/components/json_component.py index 9c41b8100d9a..f005c7c4f358 100644 --- a/gradio/components/json_component.py +++ b/gradio/components/json_component.py @@ -100,7 +100,7 @@ def flag( ) -> str: return json.dumps(payload) - def read_from_flag(self, payload: Any, flag_dir: str | Path | None = None): # noqa: ARG002 + def read_from_flag(self, payload: Any): return json.loads(payload) def api_info(self) -> dict[str, Any]: diff --git a/gradio/components/state.py b/gradio/components/state.py index b485a0031c08..d96f5bc17b81 100644 --- a/gradio/components/state.py +++ b/gradio/components/state.py @@ -28,7 +28,7 @@ class State(Component): def __init__( self, value: Any = None, - render: bool = True, # noqa: ARG002 + render: bool = True, ): """ Parameters: diff --git a/gradio/helpers.py b/gradio/helpers.py index 86e427b9cda5..09f0a012639b 100644 --- a/gradio/helpers.py +++ b/gradio/helpers.py @@ -423,12 +423,7 @@ def load_from_cache(self, example_id: int) -> list[Any]: assert utils.is_update(value_as_dict) output.append(value_as_dict) except (ValueError, TypeError, SyntaxError, AssertionError): - output.append( - component.read_from_flag( - value_to_use, - self.cached_folder, - ) - ) + output.append(component.read_from_flag(value_to_use)) return output diff --git a/guides/05_custom-components/04_backend.md b/guides/05_custom-components/04_backend.md index 4a61ab869846..76ec2fcbf212 100644 --- a/guides/05_custom-components/04_backend.md +++ b/guides/05_custom-components/04_backend.md @@ -126,7 +126,6 @@ The `data_model` in the following section. def read_from_flag( self, x: Any, - flag_dir: str | Path | None = None, ) -> GradioDataModel | Any: """ Convert the data from the csv or jsonl file into the component state.