Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT LAND [Gradio Styles Split] #813

Closed
wants to merge 3 commits into from
Closed

DO NOT LAND [Gradio Styles Split] #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b94a85
DO NOT LAND [Gradio Styles]
zakariassoul Jan 8, 2024
c5f458d
[Local Editor Styling Updates]
zakariassoul Jan 8, 2024
0d9b4b5
DO NOT LAND [Gradio Styles Split]
zakariassoul Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions cookbooks/Getting-Started/travel.aiconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"name": "NYC Trip Planner",
"schema_version": "latest",
"metadata": {
"parameters": {},
"parameters": {
"rtherhergergh": "ergergergerg",
"": ""
},
"models": {
"gpt-3.5-turbo": {
"model": "gpt-3.5-turbo",
Expand All @@ -21,7 +24,18 @@
"prompts": [
{
"name": "get_activities",
"input": "Tell me 10 fun attractions to do in NYC.",
"input": "Tell me 10 fun attractions to do in NYC.\nwefwefwe\nwefwef\nwef\n",
"metadata": {
"model": {
"name": "gpt-3.5-turbo",
"settings": {
"frequency_penalty": 1.5,
"presence_penalty": -2,
"temperature": 2
}
},
"parameters": {}
},
"outputs": []
},
{
Expand Down
162 changes: 132 additions & 30 deletions python/src/aiconfig/editor/client/src/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ export default function Editor() {
withGlobalStyles
withNormalizeCSS
theme={{
colorScheme: "dark",

headings: {
fontFamily:
"system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Arial, sans-serif",
Expand All @@ -157,15 +155,15 @@ export default function Editor() {
},

defaultGradient: {
from: "pink",
to: "pink",
deg: 45,
from: "#E88949",
to: "#E85921",
deg: 90,
},

//gradio light theme
globalStyles: (theme) => ({
".editorBackground": {
background:
"radial-gradient(ellipse at top,#08122d,#030712),radial-gradient(ellipse at bottom,#030712,#030712)",
background: theme.colorScheme === "light" ? "white" : "#0b0f19",
margin: "0 auto",
minHeight: "100vh",
},
Expand All @@ -174,48 +172,71 @@ export default function Editor() {
"sf mono, ui-monospace, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace",
},
".ghost": {
border: "none",
borderRadius: "4px",
padding: "4px",
margin: "0px",
backgroundColor: "transparent",
":hover": {
backgroundColor: "rgba(226,232,255,.1)",
},
input: {
maxHeight: "16px",
fontFamily:
"sf mono, ui-monospace, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace",
borderRadius: "8px",
margin: "8px 0px 0px 0px",
backgroundColor:
theme.colorScheme === "light" ? "white" : "#384152",
boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.05) inset",
":focus": {
outline: "solid 1px #E85921 !important",
outlineOffset: "-1px",
},
},
},
".cellStyle": {
border: "1px solid rgba(226,232,255,.1) !important",
background: "rgb(12 21 57 / 10%)",
border: "1px solid",
borderColor:
theme.colorScheme === "light" ? "#E5E7EB" : "#384152",
background: theme.colorScheme === "light" ? "white" : "#1f2938",
flex: 1,
borderTopRightRadius: "0px",
borderBottomRightRadius: "0px",
borderTopLeftRadius: "8px",
borderBottomLeftRadius: "8px",
":hover": {
background: "rgba(255, 255, 255, 0.03) !important",
background:
theme.colorScheme === "light"
? "rgba(249, 250, 251, 0.5) !important"
: "#1f2938",
},
textarea: {
border: "1px solid rgba(226,232,255,.1)",
backgroundColor: "#060c21",
border: "1px solid !important",
borderColor:
theme.colorScheme === "light"
? "#E5E7EB !important"
: "#384152 !important",
borderRadius: "8px",
margin: "8px 0px 0px 0px",
boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.05) inset",
backgroundColor:
theme.colorScheme === "light" ? "white" : "#384152",
":focus": {
outline: "solid 1px #ff1cf7 !important",
outline: "solid 1px #E85921 !important",
outlineOffset: "-1px",
},
},
},
".sidePanel": {
border: "1px solid rgba(226,232,255,.1)",
border: "1px solid",
borderColor:
theme.colorScheme === "light" ? "#E5E7EB" : "#384152",
borderLeft: "none",
borderTopRightRadius: "4px",
borderBottomRightRadius: "4px",
borderTopRightRadius: "8px",
borderBottomRightRadius: "8px",
background:
theme.colorScheme === "light"
? "linear-gradient(90deg, #F6F6F6, #FFFFFF)"
: "transparent",
input: {
border: "1px solid rgba(226,232,255,.1)",
backgroundColor: "#060c21",
border: "1px solid #E5E7EB !important",
boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.05) inset",
backgroundColor: "#ffffff",
":focus": {
outline: "solid 1px #ff1cf7 !important",
outline: "solid 1px #E85921 !important",
outlineOffset: "-1px",
},
},
Expand All @@ -226,10 +247,19 @@ export default function Editor() {
marginBottom: "0.5em",
},
".runPromptButton": {
background: "#ff1cf7",
color: "white",
borderRadius: "0",
borderRadius: "8px",
border: "1px solid #FDD7AD",
background: "linear-gradient(180deg, #FEE1C0 0%, #FCC792 100%)",
boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.05)",
margin: "4px",
height: "auto",
color: "#E85921",
path: {
color: "#E85921",
},
":hover": {
background: "linear-gradient(180deg, #FEE1C0 0%, #FF9E3D 100%)",
},
},
".actionTabsPanel": {
width: "400px",
Expand All @@ -242,6 +272,78 @@ export default function Editor() {
justifyContent: "space-between",
alignItems: "center",
},

".parametersContainer": {
maxWidth: "1250px",
maxHeight: "-webkit-fill-available",
margin: "16px auto",
padding: "0",
backgroundColor:
theme.colorScheme === "light" ? "#F9FAFB" : "#1f2938",
borderRadius: "8px",
border: "1px solid",
borderColor:
theme.colorScheme === "light" ? "#E5E7EB" : "#384152",
button: {
":hover": {
backgroundColor:
theme.colorScheme === "light" ? "#F0F1F1" : "transparent",
},
},
input: {
border: "1px solid !important",
borderColor:
theme.colorScheme === "light"
? "#E5E7EB !important"
: "#384152 !important",
boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.05) inset",
borderRadius: "8px",
backgroundColor:
theme.colorScheme === "light" ? "white" : "#384152",
":focus": {
outline: "solid 1px #E85921 !important",
outlineOffset: "-1px",
},
},
textarea: {
border: "1px solid !important",
borderColor:
theme.colorScheme === "light"
? "#E5E7EB !important"
: "#384152 !important",
boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.05) inset",
borderRadius: "8px",
backgroundColor:
theme.colorScheme === "light" ? "white" : "#384152",
":focus": {
outline: "solid 1px #E85921 !important",
outlineOffset: "-1px",
},
},
".addParameterButton": {
position: "sticky",
left: "0",
bottom: "0",
margin: "16px 0 0 0",
background: "linear-gradient(180deg, #FEE1C0 0%, #FCC792 100%)",
path: {
color: "#E85921",
},
},
},

".mantine-Slider-thumb": {
border: "0.25rem solid #E85921",
},
".mantine-Slider-bar": {
backgroundColor: "#E85921",
},
".mantine-Tabs-tab[data-active]": {
borderBottom: "solid 1px #E85921",
":hover": {
borderBottom: "solid 1px #E85921",
},
},
}),
}}
>
Expand Down
2 changes: 1 addition & 1 deletion python/src/aiconfig/editor/client/src/components/GlobalParametersContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default memo(function GlobalParametersContainer({
const { classes } = useStyles();

return (
<Container maw="80rem" className={classes.parametersContainer}>
<Container maw="80rem" className="parametersContainer">
<Accordion
styles={{
item: { borderBottom: 0 },
Expand Down
16 changes: 8 additions & 8 deletions python/src/aiconfig/editor/client/src/components/ParametersRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,20 @@ const ParameterInput = memo(function ParameterInput(props: {
value={parameterValueString}
autosize
size="xs"
minRows={3}
maxRows={5}
onChange={(event) => {
setParameterValueString(event.target.value);
debouncedCellParameterUpdate(parameterName, event.target.value);
}}
/>
<ActionIcon
onClick={() => removeParameter(parameterName)}
disabled={isReadonly}
>
<IconTrash size={16} color={isReadonly ? "grey" : "red"} />
</ActionIcon>
</Stack>
<ActionIcon
onClick={() => removeParameter(parameterName)}
style={{ marginTop: -50 }}
disabled={isReadonly}
>
<IconTrash size={16} color={isReadonly ? "grey" : "red"} />
</ActionIcon>
</Group>
);
});
Expand Down Expand Up @@ -247,7 +247,7 @@ export default memo(function ParametersRenderer(props: {
</Stack>
{isReadonly ? null : (
<Tooltip label="Add parameter">
<ActionIcon onClick={addParameter}>
<ActionIcon onClick={addParameter} className="addParameterButton">
<IconPlus size={16} />
</ActionIcon>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion python/src/aiconfig/editor/client/src/components/prompt/ModelSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default memo(function ModelSelector({
placeholder="Select model"
limit={100}
className="ghost"
variant="unstyled"
label="Model"
maxDropdownHeight={200}
rightSection={
selectedModel ? (
Expand Down
2 changes: 1 addition & 1 deletion python/src/aiconfig/editor/client/src/components/prompt/PromptName.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export default memo(function PromptName({ promptId, name, onUpdate }: Props) {
return (
<TextInput
value={nameInput}
label="Prompt Name"
className="ghost"
variant="unstyled"
placeholder="Name this prompt"
onChange={onChange}
error={
Expand Down
1 change: 1 addition & 0 deletions ...r/client/src/components/prompt/prompt_input/schema_renderer/PromptInputSchemaRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export default memo(function PromptInputSchemaRenderer(props: Props) {
return (
<Textarea
value={props.input}
label="Prompt"
onChange={(e) => props.onChangeInput(e.target.value)}
placeholder="Type a prompt"
autosize
Expand Down