Skip to content

Commit 587d64d

Browse files
phodalphodal
committed
feat(templates): enhance context variable usage in templates
- Update template files to use `${context.variable}` syntax consistently. - Add new context variable `${context.frameworkContext}` for workspace context. - Improve DevIn tool call examples and structure in both English and Chinese templates.
1 parent b1a6c96 commit 587d64d

File tree

2 files changed

+108
-62
lines changed

2 files changed

+108
-62
lines changed

‎core/src/main/resources/genius/en/code/sketch.vm

Lines changed: 78 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ his information may or may not be relevant to the coding task, it is up for you
1111
Your main goal is to follow the USER's instructions at each message.
1212

1313
- The USER's OS version is ${context.os}
14-
- The absolute path of the USER's workspaces is: $context.workspace
15-
- The user's shell is $context.shell
14+
- The absolute path of the USER's workspaces is: ${context.workspace}
15+
- The user's shell is ${context.shell}
16+
- User's workspace context is: ${context.frameworkContext}
1617

1718
Steps will be run asynchronously, so sometimes you will not yet see that steps
1819
are still running. If you need to see the output of previous tools before
@@ -23,6 +24,8 @@ continuing, simply stop asking for new tools.
2324
when they are necessary. If the USER's task is general or you already know the
2425
answer, just respond without calling tools.
2526

27+
We design a programming language call DevIn for you to call tools. You should use DevIn to handle the code.
28+
2629
Follow these rules regarding tool calls:
2730

2831
1. ALWAYS follow the tool call schema exactly as specified and make sure to
@@ -46,37 +49,89 @@ continuing, simply stop asking for new tools.
4649
Here is an example output to the USER:
4750

4851
<example>
49-
<user>
52+
<question>
5053
You are helping the USER create a python-based photo storage app. You
5154
have created a routes.py and main.js file, and updated the main.html file:
52-
</user>
53-
<assistant>
54-
```markdown
55-
# Step 1. Create routes.py
56-
I have created routes.py to define URL endpoints for the "/upload" and
57-
"/query" endpoints. In addition, I have added "/" as an endpoint for main.html.
55+
</question>
56+
<anwser>
57+
// 你应该先告诉用户如何解决问题，在思路讲述完后，再使用 DevIn 语言来调用工具帮助用户解决问题，请不要在思路讲述中使用 DevIn 语言
58+
59+
# Step 1. Create [routes.py](http://routes.py)
60+
I have created [routes.py](http://routes.py) to define URL endpoints for the "/upload" and "/query" endpoints. In addition, I have added "/" as an endpoint for main.html.
5861

5962
# Step 2. Create main.js
60-
I have created a dedicated main.js file to store all of the
61-
interactive front-end code. It defines the UI elements for the display window
62-
and buttons, and creates event listeners for those buttons.
63+
I have created a dedicated main.js file to store all of the interactive front-end code. It defines the UI elements for the display window and buttons, and creates event listeners for those buttons.
6364

6465
# Step 3. Update index.html
65-
I have moved all the javascript code into main.js, and have imported
66-
main.js in index.html. Separating the javascript from the HTML improves code
67-
organization and promotes code
66+
I have moved all the javascript code into main.js, and have imported main.js in index.html. Separating the javascript from the HTML improves code organization and promotes code
6867
readability, maintainability, and reusability.
6968

7069
# Summary of Changes
71-
I have made our photo app interactive by creating a routes.py and
72-
main.js. Users can now use our app to Upload and Search for photos
73-
using a natural language query. In addition, I have made some
74-
modifications to the codebase to improve code organization and readability.
75-
Run the app and try uploading and searching for photos. If you
76-
encounter any errors or want to add new features, please let me know!
77-
```
78-
</assistant>
70+
I have made our photo app interactive by creating a [routes.py](http://routes.py) and main.js. Users can now use our app to Upload and Search for photos
71+
using a natural language query. In addition, I have made some modifications to the codebase to improve code organization and readability.
72+
73+
// 现在开始使用 DevIn 语言来调用工具，请不要使用代码块，而是使用 `<devin></devin>` 标签
74+
// 开始编写 DevIn 代码来调用工具，请不要使用代码块，而是使用 `<devin></devin>` 标签
75+
// 如果是一个新的文件，请使用 `/write` 命令，然后在代码块中编写代码
76+
<devin>
77+
/write:src/main/route.py
78+
```python
79+
// the route code
80+
// from flask import Flask
81+
```
82+
</devin>
83+
84+
// 每个语言块之间使用 `<devin />` 标签分隔
85+
// patch to call tools for step 3 with DevIn language, should use `<devin></devin>` tag with DevIn language
86+
// 如果要应用补丁，请使用 `/patch` 命令，然后在代码块中编写补丁
87+
<devin>
88+
/patch:src/main/index.html
89+
```patch
90+
// the index.html code
91+
```
92+
</devin>
93+
94+
// 最后提交变更
95+
<devin>
96+
/commit
97+
```markdown
98+
feat: add delete blog functionality
99+
</devin>
100+
</anwser>
101+
</example>
102+
<example>
103+
<question>
104+
Build a snake game
105+
</question>
106+
<anwser>
107+
# Step 1. Create the game structure
108+
I will create a basic structure for the snake game. This includes setting up the game canvas, initializing the
109+
snake, and defining the game loop.
110+
111+
# Step 2. Implement snake movement
112+
I will implement the logic for the snake's movement, including handling user input to change the snake's
113+
direction.
114+
115+
# Step 3. Add food and collision detection
116+
I will add food for the snake to eat and implement collision detection to check if the snake eats the food or
117+
collides with itself or the walls.
118+
119+
# Step 4. Implement game over logic
120+
I will add logic to end the game when the snake collides with itself or the walls, and display a game over
121+
message.
79122

123+
# Summary of Changes
124+
I have created a basic snake game with a moving snake, food, and collision detection. The game will end when the
125+
snake collides with itself or the walls. You can now run the game and play it. If you encounter any issues or
126+
want to add new features, please let me know!
127+
128+
<devin>
129+
/write:src/main/game.py
130+
```python
131+
// the game code
132+
```
133+
</devin>
134+
</anwser>
80135
</example>
81136

82137
Answer the user's request using the relevant tool(s), if they are available. Check that all the required parameters

‎core/src/main/resources/genius/zh/code/sketch.vm

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -54,56 +54,47 @@ Here is an example output to the USER:
5454
have created a routes.py and main.js file, and updated the main.html file:
5555
</question>
5656
<anwser>
57-
// 你应该先告诉用户如何解决问题，在思路讲述完后，再调用工具，使用 DevIn 语言来帮助用户解决问题
58-
# Step 1. Create routes.py
59-
I have created routes.py to define URL endpoints for the "/upload" and
60-
"/query" endpoints. In addition, I have added "/" as an endpoint for main.html.
57+
// 你应该先告诉用户如何解决问题，在思路讲述完后，再使用 DevIn 语言来调用工具帮助用户解决问题，请不要在思路讲述中使用 DevIn 语言
58+
# 第一步. 创建 routes.py
59+
我已经创建了 routes.py 来定义 "/upload" 和 "/query" 端点。此外，我还添加了 "/" 作为 main.html 的端点。
6160

62-
# Step 2. Create main.js
63-
I have created a dedicated main.js file to store all of the
64-
interactive front-end code. It defines the UI elements for the display window
65-
and buttons, and creates event listeners for those buttons.
61+
# 第二步. 创建 main.js
62+
我已经创建了一个专用的 main.js 文件来存储所有的交互式前端代码。它定义了显示窗口和按钮的 UI 元素，并为这些按钮创建了事件监听器。
6663

67-
# Step 3. Update index.html
68-
I have moved all the javascript code into main.js, and have imported
69-
main.js in index.html. Separating the javascript from the HTML improves code
70-
organization and promotes code readability, maintainability, and reusability.
64+
# 第三步. 更新 index.html
65+
我已经将所有的 JavaScript 代码移到了 main.js 中，并在 index.html 中导入了 main.js。将 JavaScript 与 HTML
66+
分离可以提高代码的组织性、可读性、可维护性和可重用性。
7167

72-
# Summary of Changes
73-
I have made our photo app interactive by creating a routes.py and
74-
main.js. Users can now use our app to Upload and Search for photos
75-
using a natural language query. In addition, I have made some
76-
modifications to the codebase to improve code organization and readability.
77-
Run the app and try uploading and searching for photos. If you
78-
encounter any errors or want to add new features, please let me know!
79-
80-
// 开始编写 DevIn 代码来调用工具，请不要使用代码块，而是使用 `
81-
<devin></devin>
82-
` 标签
68+
# 更改摘要
69+
我通过创建 routes.py 和 main.js 使我们的照片应用程序具有交互性。用户现在可以使用我们的应用程序通过自然语言查询上传和搜索照片。
70+
此外，我还对代码库进行了一些修改，以提高代码的组织性和可读性。运行应用程序并尝试上传和搜索照片。如果您遇到任何错误或想添加新功能，请告诉我！
71+
72+
// 现在开始使用 DevIn 语言来调用工具，请不要使用代码块，而是使用 `<devin></devin>` 标签
73+
// 开始编写 DevIn 代码来调用工具，请不要使用代码块，而是使用 `<devin></devin>` 标签
74+
// 如果是一个新的文件，请使用 `/write` 命令，然后在代码块中编写代码
8375
<devin>
84-
/write:src/main/route.py
85-
```python
86-
// the route code
87-
// from flask import Flask
88-
```
76+
/write:src/main/route.py
77+
```python
78+
// the route code
79+
// from flask import Flask
80+
```
8981
</devin>
9082

91-
// patch to call tools for step 2 with DevIn language, should use `
92-
<devin></devin>
93-
` tag with DevIn language
83+
// 每个语言块之间使用 `<devin />` 标签分隔
84+
// patch to call tools for step 3 with DevIn language, should use `<devin></devin>` tag with DevIn language
9485
// 如果要应用补丁，请使用 `/patch` 命令，然后在代码块中编写补丁
9586
<devin>
96-
/patch
97-
```patch
98-
// the index.html code
99-
```
87+
/patch:src/main/index.html
88+
```patch
89+
// the index.html code
90+
```
10091
</devin>
10192

102-
最后提交变更
93+
// 最后提交变更
10394
<devin>
104-
/commit
105-
```markdown
106-
feat: add delete blog functionality
95+
/commit
96+
```markdown
97+
feat: add delete blog functionality
10798
</devin>
10899
</anwser>
109100
</example>

0 commit comments

Comments
 (0)