Skip to content

Commit

Permalink
Merge branch 'main' into 6527-theme-dropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
freddyaboulton committed Nov 21, 2023
2 parents 2b6764a + c59b87d commit c68eb20
Show file tree
Hide file tree
Showing 109 changed files with 1,036 additions and 340 deletions.
5 changes: 0 additions & 5 deletions .changeset/bumpy-rockets-rush.md

This file was deleted.

7 changes: 7 additions & 0 deletions .changeset/cruel-pandas-design.md
@@ -0,0 +1,7 @@
---
"@gradio/client": patch
"@gradio/file": patch
"gradio": patch
---

feat:Mark `FileData.orig_name` optional on the frontend aligning the type definition on the Python side
5 changes: 5 additions & 0 deletions .changeset/easy-beds-switch.md
@@ -0,0 +1,5 @@
---
"gradio": minor
---

feat:Fix typo in base.py
57 changes: 0 additions & 57 deletions .changeset/few-tips-appear.md

This file was deleted.

8 changes: 8 additions & 0 deletions .changeset/great-camels-ring.md
@@ -0,0 +1,8 @@
---
"@gradio/chatbot": patch
"@gradio/markdown": patch
"@gradio/preview": patch
"gradio": patch
---

feat:chore(deps): update all non-major dependencies
6 changes: 6 additions & 0 deletions .changeset/stupid-knives-fold.md
@@ -0,0 +1,6 @@
---
"@gradio/file": minor
"gradio": minor
---

feat:File table style with accessible file name texts
6 changes: 0 additions & 6 deletions .changeset/whole-buckets-add.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/install-frontend-deps/action.yml
Expand Up @@ -29,7 +29,7 @@ runs:
uses: pnpm/action-setup@v2
with:
version: 8.9
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend.yml
Expand Up @@ -88,7 +88,7 @@ jobs:
uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
if: steps.frontend-cache.outputs.cache-hit != 'true'
with:
node-version: 18
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
if: steps.frontend-cache.outputs.cache-hit != 'true'
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
Expand Down
55 changes: 55 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,60 @@
# gradio

## 4.5.0

### Highlights

#### New `ImageEditor` component ([#6169](https://github.com/gradio-app/gradio/pull/6169) [`9caddc17b`](https://github.com/gradio-app/gradio/commit/9caddc17b1dea8da1af8ba724c6a5eab04ce0ed8))

A brand new component, completely separate from `Image` that provides simple editing capabilities.

- Set background images from file uploads, webcam, or just paste!
- Crop images with an improved cropping UI. App authors can event set specific crop size, or crop ratios (`1:1`, etc)
- Paint on top of any image (or no image) and erase any mistakes!
- The ImageEditor supports layers, confining draw and erase actions to that layer.
- More flexible access to data. The image component returns a composite image representing the final state of the canvas as well as providing the background and all layers as individual images.
- Fully customisable. All features can be enabled and disabled. Even the brush color swatches can be customised.

<video src="https://user-images.githubusercontent.com/12937446/284027169-31188926-fd16-4a1c-8718-998e7aae4695.mp4" autoplay muted></video>

```py

def fn(im):
im["composite"] # the full canvas
im["background"] # the background image
im["layers"] # a list of individual layers


im = gr.ImageEditor(
# decide which sources you'd like to accept
sources=["upload", "webcam", "clipboard"],
# set a cropsize constraint, can either be a ratio or a concrete [width, height]
crop_size="1:1",
# enable crop (or disable it)
transforms=["crop"],
# customise the brush
brush=Brush(
default_size="25", # or leave it as 'auto'
color_mode="fixed", # 'fixed' hides the user swatches and colorpicker, 'defaults' shows it
default_color="hotpink", # html names are supported
colors=[
"rgba(0, 150, 150, 1)", # rgb(a)
"#fff", # hex rgb
"hsl(360, 120, 120)" # in fact any valid colorstring
]
),
brush=Eraser(default_size="25")
)

```

Thanks [@pngwn](https://github.com/pngwn)!

### Fixes

- [#6497](https://github.com/gradio-app/gradio/pull/6497) [`1baed201b`](https://github.com/gradio-app/gradio/commit/1baed201b12ecb5791146aed9a86b576c3595130) - Fix SourceFileReloader to watch the module with a qualified name to avoid importing a module with the same name from a different path. Thanks [@whitphx](https://github.com/whitphx)!
- [#6502](https://github.com/gradio-app/gradio/pull/6502) [`070f71c93`](https://github.com/gradio-app/gradio/commit/070f71c933d846ce8e2fe11cdd9bc0f3f897f29f) - Ensure image editor crop and draw cursor works as expected when the scroll position changes. Thanks [@pngwn](https://github.com/pngwn)!

## 4.4.1

### Features
Expand Down
4 changes: 2 additions & 2 deletions client/js/src/upload.ts
Expand Up @@ -136,7 +136,7 @@ export async function prepare_files(
export class FileData {
path: string;
url?: string;
orig_name: string;
orig_name?: string;
size?: number;
blob?: File;
is_stream?: boolean;
Expand All @@ -155,7 +155,7 @@ export class FileData {
}: {
path: string;
url?: string;
orig_name: string;
orig_name?: string;
size?: number;
blob?: File;
is_stream?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion client/python/gradio_client/client.py
Expand Up @@ -253,7 +253,7 @@ def duplicate(
)
hardware = hardware or original_info.hardware
if current_hardware != hardware:
huggingface_hub.request_space_hardware(space_id, hardware) # type: ignore
huggingface_hub.request_space_hardware(space_id, hardware, token=hf_token) # type: ignore
print(
f"-------\nNOTE: this Space uses upgraded hardware: {hardware}... see billing info at https://huggingface.co/settings/billing\n-------"
)
Expand Down

0 comments on commit c68eb20

Please sign in to comment.