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.

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

Jump to bottom

More flexible build process for Athena #325

Merged
merged 61 commits into from
Sep 4, 2024
Merged

More flexible build process for Athena #325

merged 61 commits into from
Sep 4, 2024

Conversation

dmytropolityka
Copy link
Contributor

@dmytropolityka dmytropolityka commented Aug 4, 2024 •
edited
Loading

Motivation and Context

Athena was initially designed as a modular application with a common module (Athena) that is integral to every other module. With multiple students working asynchronously on different modules, stability issues can arise due to database changes, version upgrades, or feature enhancements. This PR leverages Poetry to enable dynamic importing of the common module, Athena, which eliminates the need for a monolithic structure and enhances modularity.

Description

  1. Each module imports the common Athena module dynamically from either a GitHub repository or a local version.
  2. Modules are assembled independently using the provided lint all, lock all, and build all scripts.
  3. Developers can specify the required version of the middleware for their module.
  4. This PR lays the groundwork for pytest integration.

Steps for Testing

Deploy the changes to a test server.
Verify that all modules function correctly and that the integration with the common Athena module is stable.

Resolves

This PR resolves the following issues: #321, #298, #297

@dmytropolityka dmytropolityka changed the title Feature/change build process More flexible build process for Athena Aug 4, 2024
@dmytropolityka dmytropolityka marked this pull request as ready for review August 4, 2024 23:32
@dmytropolityka dmytropolityka mentioned this pull request Aug 5, 2024
Closed
@FelixTJDietrich
Copy link
Collaborator

Enea currently updated the env files for the text llm module on the test server so that module might not work with this PR right now because of this

FelixTJDietrich
FelixTJDietrich reviewed Aug 5, 2024
View reviewed changes
install_modules.py Outdated Show resolved Hide resolved
install_modules.py Outdated Show resolved Hide resolved
@maximiliansoelch maximiliansoelch added the deploy:athena-test1 Athena Test Server 1 label Aug 7, 2024
@dmytropolityka dmytropolityka removed the deploy:athena-test1 Athena Test Server 1 label Aug 8, 2024
@FelixTJDietrich
Copy link
Collaborator

Can you also resolve the conflicts?

@FelixTJDietrich
Copy link
Collaborator

module_example is also a programming module

@dmytropolityka
move module example to programming modules
e625cc5
@dmytropolityka
Merge branch 'develop' into feature/change-build-process
815699b 
# Conflicts:
#	module_text_llm/poetry.lock
#	modules/text/module_text_llm/module_text_llm/helpers/models/replicate.py
#	modules/text/module_text_llm/pyproject.toml
@dmytropolityka
fix testing server url; resolve merge conflict issues
d95f836
@dmytropolityka
fix further occurrences
c195e40
@dmytropolityka
remove duplicated value
3b56177
@FelixTJDietrich FelixTJDietrich added the deploy:athena-test2 Athena Test Server 2 label Sep 2, 2024
@FelixTJDietrich FelixTJDietrich temporarily deployed to athena-test2.ase.cit.tum.de September 2, 2024 12:26 — with GitHub Actions Inactive
@github-actions github-actions bot removed the deploy:athena-test2 Athena Test Server 2 label Sep 2, 2024
@github-actions github-actions bot added the lock:athena-test2 Is currently deployed to Athena Test Server 2 label Sep 2, 2024
@FelixTJDietrich FelixTJDietrich added deploy:athena-test1 Athena Test Server 1 and removed lock:athena-test2 Is currently deployed to Athena Test Server 2 labels Sep 2, 2024
@FelixTJDietrich FelixTJDietrich temporarily deployed to athena-test1.ase.cit.tum.de September 2, 2024 12:32 — with GitHub Actions Inactive
@github-actions github-actions bot added lock:athena-test1 Is currently deployed to Athena Test Server 1 and removed deploy:athena-test1 Athena Test Server 1 labels Sep 2, 2024
FelixTJDietrich
FelixTJDietrich requested changes Sep 2, 2024
View reviewed changes
Copy link
Collaborator

@FelixTJDietrich FelixTJDietrich left a comment

Choose a reason for hiding this comment

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

Update launch.json and athena-workspace.code-workspace

@FelixTJDietrich FelixTJDietrich added deploy:athena-test1 Athena Test Server 1 and removed lock:athena-test1 Is currently deployed to Athena Test Server 1 labels Sep 4, 2024
@FelixTJDietrich FelixTJDietrich temporarily deployed to athena-test1.ase.cit.tum.de September 4, 2024 11:49 — with GitHub Actions Inactive
@github-actions github-actions bot removed the deploy:athena-test1 Athena Test Server 1 label Sep 4, 2024
FelixTJDietrich
FelixTJDietrich approved these changes Sep 4, 2024
View reviewed changes
Copy link
Collaborator

@FelixTJDietrich FelixTJDietrich left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot added the lock:athena-test1 Is currently deployed to Athena Test Server 1 label Sep 4, 2024
@FelixTJDietrich
Copy link
Collaborator

Also works on TS1 except for programming llm, idk what's up with that.

@FelixTJDietrich FelixTJDietrich merged commit 5d3b517 into develop Sep 4, 2024
22 checks passed
@FelixTJDietrich FelixTJDietrich deleted the feature/change-build-process branch September 4, 2024 11:56
@github-actions github-actions bot removed the lock:athena-test1 Is currently deployed to Athena Test Server 1 label Sep 4, 2024
@FelixTJDietrich FelixTJDietrich mentioned this pull request Sep 4, 2024
Closed
@dmytropolityka dmytropolityka added the deploy:athena-test1 Athena Test Server 1 label Sep 4, 2024
@github-actions github-actions bot added deployment-error Added by deployment workflows if an error occured and removed deploy:athena-test1 Athena Test Server 1 labels Sep 4, 2024
@dmytropolityka dmytropolityka removed the deployment-error Added by deployment workflows if an error occured label Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FelixTJDietrich FelixTJDietrich FelixTJDietrich approved these changes

@maximiliansoelch maximiliansoelch maximiliansoelch left review comments

@EneaGore EneaGore Awaiting requested review from EneaGore

@LeonWehrhahn LeonWehrhahn Awaiting requested review from LeonWehrhahn

Assignees

@dmytropolityka dmytropolityka

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dmytropolityka @FelixTJDietrich @maximiliansoelch