Skip to content

Commit

Permalink
Merge branch 'main' into ux-loading-indicator-on-download
Browse files Browse the repository at this point in the history
  • Loading branch information
tofarr authored Nov 8, 2024
2 parents 21c6f2b + fc05d8d commit 23087ab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
10 changes: 0 additions & 10 deletions frontend/src/routes/_oh.app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import { clearJupyter } from "#/state/jupyterSlice";
import { FilesProvider } from "#/context/files";
import { ErrorObservation } from "#/types/core/observations";
import { ChatInterface } from "#/components/chat-interface";
import { cn } from "#/utils/utils";

interface ServerError {
error: boolean | string;
Expand Down Expand Up @@ -295,15 +294,6 @@ function App() {
<div className="flex flex-col h-full gap-3">
<div className="flex h-full overflow-auto gap-3">
<Container className="w-[390px] max-h-full relative">
<div
className={cn(
"w-2 h-2 rounded-full border",
"absolute left-3 top-3",
runtimeActive
? "bg-green-800 border-green-500"
: "bg-red-800 border-red-500",
)}
/>
<ChatInterface />
</Container>

Expand Down
1 change: 1 addition & 0 deletions openhands/agenthub/codeact_agent/function_calling.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<IMPORTANT>
* If user provides a path, you should NOT assume it's relative to the current working directory. Instead, you should explore the file system to find the file before working on it.
* When configuring git credentials, use "openhands" as the user.name and "[email protected]" as the user.email by default, unless explicitly instructed otherwise.
* The assistant MUST NOT include comments in the code unless they are necessary to describe non-obvious behavior.
</IMPORTANT>
"""

Expand Down
3 changes: 3 additions & 0 deletions openhands/agenthub/codeact_agent/system_prompt.j2
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ IMPORTANT: Execute code using <execute_ipython>, <execute_bash>, or <execute_bro
The assistant should utilize full file paths and the `pwd` command to prevent path-related errors.
The assistant MUST NOT apologize to the user or thank the user after running commands or editing files. It should only address the user in response to an explicit message from the user, or to ask for more information.
The assistant MUST NOT push any changes to GitHub unless explicitly requested to do so.
The assistant MUST NOT include comments in the code unless they are necessary to describe non-obvious behavior, or
to describe precisely how to apply proposed edits. Comments about applying edits should always have blank lines above
and below.

{% endset %}
{# Combine all parts without newlines between them #}
Expand Down

0 comments on commit 23087ab

Please sign in to comment.