Skip to content

Merge Dev #840

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

Merged
mavisakalyan merged 6 commits into from
Jan 21, 2025
Merged

Merge Dev #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21b7c26
Update styles and modal
mavisakalyan Jan 2, 2025
ba52f0b
Add in development message
mavisakalyan Jan 3, 2025
4ae4204
make deploy button large
mavisakalyan Jan 3, 2025
9dcc16d
Merge pull request #839 from UpstreetAI/builder
mavisakalyan Jan 3, 2025
4a9b631
fix: install agent's package json on build
SaadBazaz Jan 14, 2025
6ae419c
Merge pull request #845 from UpstreetAI/usdk-build-fix
mavisakalyan Jan 14, 2025
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
6 changes: 4 additions & 2 deletions apps/chat/app/create/builder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ export default function AgentEditor({
<p className={featureTextClass}>
{featureSpec.displayName ?? featureSpec.name}
</p>
<p className='absolute bottom-3 right-0 left-0 text-xs'>In development.</p>
</div>
</div>
</div>
Expand All @@ -927,7 +928,7 @@ export default function AgentEditor({
<div className={cn('flex flex-row h-full items-center justify-center', step !== 2 && 'hidden')}>
<div className={`flex flex-col w-[400px] h-full`}>

<div className='text-lg font-bold flex flex-row items-center justify-center mb-4'><Icon icon="Chat" className='size-5 mr-2' /> <h2>Test Agent</h2></div>
{/* <div className='text-lg font-bold flex flex-row items-center justify-center mb-4'><Icon icon="Chat" className='size-5 mr-2' /> <h2>Test Agent</h2></div> */}
<div className='h-full w-full relative'>
<Chat
room={room}
Expand All @@ -947,6 +948,7 @@ export default function AgentEditor({
<div className={cn('flex flex-col items-center justify-center h-full', step !== 3 && 'hidden')}>

<Button
size='large'
onClick={() => {
setDeploying(true);
editorForm.current?.dispatchEvent(new Event('submit', { bubbles: true, cancelable: true }));
Expand Down Expand Up @@ -977,7 +979,7 @@ export default function AgentEditor({

{/* assistant */}

<div className={`flex-col relative right-4 bottom-4 h-full w-[300px] bg-white ${isAssistantVisible ? '' : 'hidden'}`}>
<div className={`flex-col relative right-4 bottom-4 h-full w-[300px] ${isAssistantVisible ? '' : ''}`}>
<div className="flex flex-col flex-1 h-[calc(100%-40px)] overflow-scroll px-1 pb-8 pt-6">
{builderMessages.map((message, index) => (
<div key={index} className={cn('flex gap-2 mb-4 px-4')}>
Expand Down
2 changes: 1 addition & 1 deletion apps/chat/app/create/modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const Modal = ({ icon, title, description, open, close, children, disable

return (
<div className="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
<div className="fixed inset-0 bg-gray-700/75 transition-opacity" aria-hidden="true"></div>
<div className="fixed inset-0 bg-gray-700/75 transition-opacity" aria-hidden="true" />
<div className="fixed inset-0 z-10 w-screen overflow-y-auto">
<div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0" onClick={(e) => e.stopPropagation()}>
<div className="relative transform overflow-hidden border-2 bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg pb-6 pt-2">
Expand Down
4 changes: 4 additions & 0 deletions packages/usdk/packages/upstreet-agent/packages/react-agents-node/install-agent.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { mkdirp } from 'mkdirp';
import { rimraf } from 'rimraf';
import toml from '@iarna/toml';
import { getCurrentDirname } from '../react-agents/util/path-util.mjs';
import { npmInstall } from '../../../../lib/npm-util.mjs';

const dirname = getCurrentDirname(import.meta, process);
const copyWithStringTransform = async (src, dst, transformFn = (s) => s) => {
Expand Down Expand Up @@ -97,6 +98,9 @@ export const installAgent = async (directory) => {
};
await removeDependencies();

// install local dependencies (from the agent's package.json)
await npmInstall(directory);

// symlink node_modules deps
const addDependencies = async () => {
await Promise.all(dependencies.map(async (name) => {
Expand Down