-
Notifications
You must be signed in to change notification settings - Fork 44.7k
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
👋 🤩 Convert to proper python module. Working Docker image. #329
👋 🤩 Convert to proper python module. Working Docker image. #329
Conversation
@Torantulino this one would be really beneficial to your project as it makes the project have a real python module namespace to work with. This then makes tests discoverable in IDE's (vscode, etc). In addidtion I fixed the Dockerfile and while at it made sure to have a full run inside of it to at least know that it works. |
the |
When I try your updated version I do run in problems: When not specifying pinecone data it runs stuck in a connection error for it: raise MaxRetryError(_pool, url, error or ResponseError(cause)) When running with pinecone data I do seem to run into problems with the free plan or am I doing something wrong? This is the final output error: "ThisWhen The index exceeds the project quota of 1 pods by 1 pods. Upgrade your account or change the project settings to increase the quota." |
Are you running in docker or normally? I’m 99% sure my change has got nothing to do with this. Are you able to run successfully on master branch with pinewood credentials? |
Oh I see now… look at your logs. You probably have |
bef690b
to
9caaca3
Compare
Just rebased cleanly on latest master (c6d9022). |
@muneebable can you review again? there are no additional changes, just a rebase. |
@ryanpeach I also notice that there is not very much progress over the last few days on this repo. I hope @Torantulino will get some help / organizes this somehow before people are going to seriously have a contending fork. |
@dhensen I have resolved your concerns. Yes the code quality in this repo concerns me in terms of maintainability. Without proper CICD, a module, and reliable tests, it's not maintainable in the slightest. Theres also a lot of use of globals, just not sure how much experience the creator has with python tbh. However, it is where the community is and I will stick with the community. |
@dhensen Resolve the conflicts |
@nponeccop thanks for the ping! just solved conflicts. @Torantulino If you could consider giving this some prio over other PR's even though there is a voting system. My argumentation:
For what it's worth: I always run the bot to see if it is able to fully start. Willing to work on testsuite and CI/CD, but I see a some PR's already. |
Well, I would like to get all minor PRs merged before. No major features such as new commands etc. Maybe we'll need a shim so that features can be incorporated and migrated gradually |
@nponeccop good to see your batching issue, great idea. When switching from script-based importing to a proper python module it's difficult. I can't even think of what a shim for that would look like, any ideas? Ideally this one should be merged as fast as possible, because the longer we wait the harder it's going to be. In company projects I always put a feature freeze, then do this kind of thing, then unfreeze. But that's kind of impossible on a 20K stars trending github repo. I'll just try to keep this one mergable |
We already have a feature freeze. We don't merge major features (read: new commands) In my company I write a shim, but I don't even know Python so I cannot advice. |
@dhensen waiting for this to rebase this one: @Torantulino can we get this in ? |
Fixed conflicts.
Quick run shows it still works. |
With e475474 my "502 catch slipped-in feature" disappeared. I'll be making an isolated PR for that one. So this PR is now isolated to converting in a module and fix the Dockerfile because of the rename from script to autogpt |
README.md
Outdated
@@ -187,7 +201,7 @@ Pinecone enables the storage of vast amounts of vector-based memory, allowing fo | |||
|
|||
### Setting up environment variables | |||
|
|||
Simply set them in the `.env` file. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo the whitespace fixes. We will fix them in a separate PR.
autogpt/json_parser.py
Outdated
@@ -26,7 +26,7 @@ | |||
""" | |||
|
|||
|
|||
def fix_and_parse_json( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A whitespace fix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh damn.. how does this happen, my IDE or what?
autogpt/speak.py
Outdated
@@ -73,7 +73,7 @@ def speak(): | |||
success = eleven_labs_speech(text, voice_index) | |||
if not success: | |||
gtts_speech(text) | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A whitespace fix
Merging without adding whitespace is getting harder and harder. I hope this can be merged soon. |
Yes yes, we working on fixing the whitespace once and for all. There is a whitespace PR that was supposed to get merged yesterday. And the changes are creeping in during auto-merge. Auto-merge is not perfect even if it doesn't detect conflicts. Also this infinite rebasing is because of a long PR backlog. We will try to improve, another person has volunteered yesterday to help. |
I have to start vanilla vim (zero plugins) to do merges in plaintext to also avoid whitespace being removed. No problem ofcourse. But I would like to know a time window for this merge, because small PR's keep coming in, at this rate this is never getting merged, and as the project grows, merging work on this branch continues to grow. ❤️ |
@dhensen There are conflicts again. You can fix them now, or wait until your issue is about to merge. Your PR is in the Batch 3, so you can wait for Batch 2 to get closed first. But you should understand that fixing the conflicts sooner is easier, so it's up to you. I will only review the code without conflicts, due to lack of time. |
@dhensen @nponeccop I know we're going to get this in, I have faith in you 🙏 May I suggest one thing @dhensen ? squash all your commits into 1 and rewrite history (push force) for this PR. This will avoid painful rebase for others, they will just have one commit to rebase instead of 31. your changes can fit one commit called "create autogpt module", we don't need 30 commits here. |
Thanks for the support @merwanehamadi, yes I thinking of doing that earlier today when I was looking at this branch' history earlier today.. what a complete mess. |
Well, many people add merge commits instead of rebasing. Merging doesn't suffer from this work bloat the way rebasing does, but it has its own flaws. The next whitespace fix is #810. Hopefully tomorrow. Today we finally learned how to merge more quickly. |
91bfd0c
to
888cacb
Compare
I did it... rebasing was hell, halfway I aborted that and did the Onto the next rebase. Consider me a Jedi from now on, as I'll be using the force continuously on this PR now. |
8b42efc
to
98205de
Compare
094cbd4
to
30dfe40
Compare
autogpt/data/prompt.txt
Outdated
@@ -0,0 +1,63 @@ | |||
CONSTRAINTS: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/data/prompt.txt is no longer part of the project (now prompt.py)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Richard, I will remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has been removed
Also fixed the Dockerfile. Converting to module makes development easier. Fixes coverage script in CI and test imports.
30dfe40
to
6c524af
Compare
hey @dhensen we're close to the finish line. I think your PR is the likely candidate for the module change. All it needs is one last conflict fix |
I put your commit there plus added some imports and a redirect message: #1380 |
closed, many thanks for your hard work on this |
thanks @dhensen |
Co-authored-by: Luke <2609441+lc0rp@users.noreply.github.com>
Convert to proper python module.
This also makes creating tests easier.
I adjusted README.md.
Bonus: Dockerfile fixed. I've tested it with a simple scenario (using custom search engine, pinecone, no speak, no azure) and it is running fine.