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.

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

Update README and chatbot dep #21

Merged
merged 4 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Out of the box you'll get an app layout with chrome (header/sidebar), routing, b
Create a .env file with the following values (ask for the real URLs)

```
REACT_APP_ROUTER_URL=''
REACT_APP_INFO_URL=''
REACT_APP_RETRIEVER_URL=''
REACT_APP_LLM_URL=''
REACT_APP_ROUTER_URL='http://localhost:8080/assistant/chat/streaming'
REACT_APP_INFO_URL='http://localhost:8080/admin/assistant'
REACT_APP_RETRIEVER_URL='http://localhost:8080/admin/assistant/retrieverConnection'
REACT_APP_LLM_URL='http://localhost:8080/admin/assistant/llm'
```

```bash
Expand Down
50 changes: 40 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@patternfly/react-core": "^6.0.0",
"@patternfly/react-icons": "^6.0.0",
"@patternfly/react-styles": "^6.0.0",
"@patternfly/chatbot": "^2.1.0-prerelease.17",
"@patternfly/chatbot": "^2.1.0-prerelease.26",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sirv-cli": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/app/BaseChatbot/BaseChatbot.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('Base chatbot', () => {
<RouterProvider router={router} />
</AppDataProvider>,
);
screen.getByText('Red Hat AI Assistant');
screen.getByText('Test');
screen.getByText('Hello, Chatbot User');
screen.getByText('How may I help you today?');
screen.getByText('Verify all information from this tool. LLMs make mistakes.');
Expand Down
22 changes: 8 additions & 14 deletions src/app/BaseChatbot/BaseChatbot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@

const BaseChatbot: React.FunctionComponent = () => {
const { chatbots } = useLoaderData() as { chatbots: CannedChatbot[] };
const {
flyoutMenuSelectedChatbot,
updateFlyoutMenuSelectedChatbot,
chatbots: appDataChatbots,
setChatbots,
} = useAppData();
const { flyoutMenuSelectedChatbot, updateFlyoutMenuSelectedChatbot, chatbots: appDataChatbots } = useAppData();
const [isSendButtonDisabled, setIsSendButtonDisabled] = React.useState(true);
const [messages, setMessages] = React.useState<MessageProps[]>([]);
const [currentMessage, setCurrentMessage] = React.useState<string[]>([]);
Expand All @@ -48,17 +43,16 @@
const [hasStopButton, setHasStopButton] = React.useState(false);
const [files, setFiles] = React.useState<UserFacingFile[]>([]);
const [isLoadingFile, setIsLoadingFile] = React.useState<boolean>(false);
const [allChatbots, setAllChatbots] = React.useState<CannedChatbot[]>(chatbots);

React.useEffect(() => {
document.title = `Red Hat Composer AI Studio | ${currentChatbot?.name}`;
}, []);

Check warning on line 50 in src/app/BaseChatbot/BaseChatbot.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook React.useEffect has a missing dependency: 'currentChatbot?.name'. Either include it or remove the dependency array

React.useEffect(() => {
setChatbots(chatbots);
}, [chatbots]);

React.useEffect(() => {
setChatbots(appDataChatbots);
if (appDataChatbots.length > 0) {
setAllChatbots(appDataChatbots);
}
}, [appDataChatbots]);

React.useEffect(() => {
Expand All @@ -73,7 +67,7 @@

React.useEffect(() => {
document.title = `Red Hat Composer AI Studio | ${currentChatbot?.name}${announcement ? ` - ${announcement}` : ''}`;
}, [announcement]);

Check warning on line 70 in src/app/BaseChatbot/BaseChatbot.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook React.useEffect has a missing dependency: 'currentChatbot?.name'. Either include it or remove the dependency array

// Auto-scrolls to the latest message
React.useEffect(() => {
Expand Down Expand Up @@ -370,10 +364,10 @@
<Chatbot displayMode={displayMode}>
<ChatbotHeader>
<ChatbotHeaderMain>
<HeaderDropdown selectedChatbot={currentChatbot} chatbots={chatbots} onSelect={onSelect} />
<HeaderDropdown selectedChatbot={currentChatbot} chatbots={allChatbots} onSelect={onSelect} />
</ChatbotHeaderMain>
{chatbots.length >= 2 && (
<Button component="a" href={`/compare?assistants=${chatbots[0].name}%2C${chatbots[1].name}`}>
{allChatbots.length >= 2 && (
<Button component="a" href={`/compare?assistants=${allChatbots[0].name}%2C${allChatbots[1].name}`}>
Compare
</Button>
)}
Expand Down
17 changes: 10 additions & 7 deletions src/app/Compare/CompareLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

export const CompareLayout: React.FunctionComponent = () => {
// information from api
const { chatbots } = useLoaderData() as { chatbots: CannedChatbot[] };
const { chatbots: initialChatbots } = useLoaderData() as { chatbots: CannedChatbot[] };

// state
const [isSendButtonDisabled, setIsSendButtonDisabled] = React.useState(true);
Expand All @@ -30,6 +30,7 @@
const [files, setFiles] = React.useState<UserFacingFile[]>([]);
const [isLoadingFile, setIsLoadingFile] = React.useState<boolean>(false);
const [error, setError] = React.useState<ErrorObject>();
const [allChatbots, setAllChatbots] = React.useState<CannedChatbot[]>(initialChatbots);

// constants for search params
const [searchParams, setSearchParams] = useSearchParams();
Expand All @@ -40,16 +41,18 @@
const { status } = useChildStatus();

// context, used for panels
const { setChatbots } = useAppData();
const { chatbots: appDataChatbots } = useAppData();

React.useEffect(() => {
setChatbots(chatbots);
}, [chatbots]);
if (appDataChatbots.length > 0) {
setAllChatbots(appDataChatbots);
}
}, [appDataChatbots]);

React.useEffect(() => {
document.title = `Red Hat Composer AI Studio | Compare`;
if (assistants && assistants.length === 2) {
const actualChatbots = chatbots.filter(
const actualChatbots = allChatbots.filter(
(chatbot) => chatbot.name === assistants[0] || chatbot.name === assistants[1],
);
if (actualChatbots.length === 2) {
Expand Down Expand Up @@ -81,7 +84,7 @@
return () => {
window.removeEventListener('resize', updateChatbotVisibility);
};
}, []);

Check warning on line 87 in src/app/Compare/CompareLayout.tsx

View workflow job for this annotation

GitHub Actions / Lint

React Hook React.useEffect has missing dependencies: 'allChatbots', 'assistants', and 'navigate'. Either include them or remove the dependency array

React.useEffect(() => {
if (status) {
Expand Down Expand Up @@ -229,7 +232,7 @@
<div className={css('compare-item', !showFirstChatbot ? 'compare-item-hidden' : undefined)}>
<CompareChild
chatbot={firstChatbot}
allChatbots={chatbots}
allChatbots={allChatbots}
controller={firstController}
setController={setFirstController}
input={input}
Expand All @@ -246,7 +249,7 @@
<div className={css('compare-item', !showSecondChatbot ? 'compare-item-hidden' : undefined)}>
<CompareChild
chatbot={secondChatbot}
allChatbots={chatbots}
allChatbots={allChatbots}
controller={secondController}
setController={setSecondController}
input={input}
Expand Down
2 changes: 1 addition & 1 deletion src/app/FlyoutForm/ExpandingTextInputs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const ExpandingTextInputs: React.FunctionComponent<ExpandingTextInputsPro
</Button>
</div>
{values.length > 0 && (
<section aria-label="Example questions" tabIndex={-1}>
<section className="expanding-text-input__section" aria-label="Example questions" tabIndex={-1}>
{values.map((value, index) => {
return (
<div key={index} className="expanding-text-inputs__row expanding-text-input__row-with-background">
Expand Down
3 changes: 2 additions & 1 deletion src/app/HeaderDropdown/HeaderDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const HeaderDropdown: React.FunctionComponent<HeaderDropdownProps> = ({
}
};

const selectedChatbotName = selectedChatbot?.displayName ?? selectedChatbot?.name;
return (
<Dropdown
className="assistant-selector-menu"
Expand All @@ -67,7 +68,7 @@ export const HeaderDropdown: React.FunctionComponent<HeaderDropdownProps> = ({
toggle={(toggleRef: React.Ref<MenuToggleElement>) => {
return (
<MenuToggle ref={toggleRef} onClick={onToggleClick} isExpanded={isOpen}>
Red Hat AI Assistant
{selectedChatbotName ?? 'Red Hat AI Assistant'}
</MenuToggle>
);
}}
Expand Down
6 changes: 6 additions & 0 deletions src/app/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,12 @@ pf-v6-c-page__main-container.pf-m-fill {
position: relative;
}

.expanding-text-input__section {
display: flex;
gap: var(--pf-t--global--spacer--sm);
flex-direction: column;
}

.hidden {
position: absolute;
opacity: 0;
Expand Down
Loading