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

Project path is now workspace #749

Merged
merged 9 commits into from
Oct 12, 2023
Merged

Conversation

UmerHA
Copy link
Collaborator

@UmerHA UmerHA commented Oct 1, 2023

Solves the question raised in #721:

The entire project folder is now the workspace. Everything else is moved into the .gpteng folder.

This includes:

  • The prompt is first searched for in .gpteng, then in the project path, then asked for via input
  • The all_output.txt is moved into .gpteng/memory

With this, the create project and improve project workflows now assume the same workspace structure.

UmerHA added a commit to UmerHA/gpt-engineer that referenced this pull request Oct 1, 2023
@ATheorell
Copy link
Collaborator

@AntonOsika I think that this is a necessary and great change and it would be good to have it merged ASAP, since it is somewhat blocking progress in #721 . Since this is a rather big change to the structure with the designated workspace that I believe you designed, would it be possible for you to approve this?

@UmerHA great job! Can you fix the failing tests?

@ATheorell
Copy link
Collaborator

ATheorell commented Oct 5, 2023

Finally found the time to look at this!

I was testing the improve pipeline with this PR, using my favorite example (that you already know @UmerHA ) https://github.com/ATheorell/Opensource-Contribution-Leaderboard/tree/improveCode

Either I'm using -improve wrong, or something is going wrong in the file selection. In the following, I'm on commit 4ac2990

(venv) me:~/Software/Opensource-Contribution-Leaderboard$ ls
admin    build               Dockerfile  favicon.ico  LICENSE  node_modules    package.json       prompt     REST-API.md  tests  archive  docker-compose.yml  docs        index.html   memory   Opensource-Contribution-Leaderboard  package-lock.json  README.md  src          workspace
(venv) me:~/Software/Opensource-Contribution-Leaderboard$ gpt-engineer -i .
Running gpt-engineer in /home/axel/Software/Opensource-Contribution-Leaderboard 

How do you want to select the files?

1. Use File explorer.
2. Use Command-Line.

Select option and press Enter (default=1): 2
     .gpteng/
     ├──  archive/
     └──  memory/
         └──  logs/
Select files by entering the numbers separated by commas/spaces or
specify range with a dash. 
Example: 1,2,3-5,7,9,13-15,18,20 (enter 'all' to select everything)

On the main branch (c5ac0fc), it looks like this (the behavior I expect):

(venv) me:~/Software/Opensource-Contribution-Leaderboard$ gpt-engineer -i .
Running gpt-engineer in /home/axel/Software/Opensource-Contribution-Leaderboard 

How do you want to select the files?

1. Use File explorer.
2. Use Command-Line.

Select option and press Enter (default=1): 2
     Opensource-Contribution-Leaderboard/
     ├──  admin/
     │   ├──  build/
0.   │   │   └──  webpack.config.js
     │   ├──  docs/
1.   │   │   └──  how-to-make-your-own-scaffold.md
2.   │   ├──  favicon.ico
3.   │   ├──  index.html
4.   │   ├──  LICENSE
5.   │   ├──  package-lock.json
6.   │   ├──  package.json
... and many more files ...

I'm also a little puzzled how, on the new branch, which .gpteng folder it is displaying, since I don't see it in the local repo.

@ATheorell
Copy link
Collaborator

...and @UmerHA, can you clarify in this chat how this PR relates to #669 . I'm quite confused now.

gpt_engineer/main.py Outdated Show resolved Hide resolved
gpt_engineer/main.py Outdated Show resolved Hide resolved
scripts/rerun_edited_message_logs.py Outdated Show resolved Hide resolved
@AntonOsika
Copy link
Collaborator

Hey some small changes requested, see my comments!

@TheoMcCabe
Copy link
Collaborator

Damn i made quite a simile PR this morning :) should have read this first!!

#777

perhaps i should close as this PR supercedes my work

Copy link
Contributor

@pbharrin pbharrin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once again, great job Umer.
I think we should leave the prompt as it was done previously (See my comment on main.py). Other than that LGTM.

@UmerHA
Copy link
Collaborator Author

UmerHA commented Oct 12, 2023

I've addressed all review comments & the tests pass. Peter approved, Anton approved on Discord; so let's merge.

@UmerHA UmerHA merged commit 7dac88a into gpt-engineer-org:main Oct 12, 2023
4 checks passed
@UmerHA UmerHA deleted the gpteng-subfolder branch October 12, 2023 10:48
70ziko pushed a commit to 70ziko/gpt-engineer that referenced this pull request Oct 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants