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

rehacking app, getting towards full pypi mode 🀩 #18

Merged
merged 10 commits into from
Dec 17, 2023
Merged

Conversation

MMathisLab
Copy link
Member

@MMathisLab MMathisLab commented Dec 16, 2023

Okay! A bit of a big PR:

  • move static images into amadeus as a module
  • fix app.py such that it is not looking locally for files, but from site packages
  • fix app_utils.py to find the correct site package files
  • add required static files to setup.cfg
  • remove heavy demo video from the app
  • add back local logging; note this does NOT get transmitted back to us.

Not fully done and ready for pypi production, TODOs:

  • static dir not being imported/installed correctly yet
FIX! Click to expand

πŸ› Break through! Learned a very handy command, tree, which shows me I don't have the subdir of static available to me...

amadeusgpt
β”œβ”€β”€ __init__.py
β”œβ”€β”€ __pycache__
β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ amadeus_security.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ app.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ app_utils.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ gui.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ implementation.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ logger.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ main.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ module_matching.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ utils.cpython-39.pyc
β”‚Β Β  └── version.cpython-39.pyc
β”œβ”€β”€ amadeus_security.py
β”œβ”€β”€ app.py
β”œβ”€β”€ app_utils.py
β”œβ”€β”€ brains
β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ base.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ code_generator.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ diagnosis.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ explainer.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ rephraser.cpython-39.pyc
β”‚Β Β  β”‚Β Β  └── self_debug.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ base.py
β”‚Β Β  β”œβ”€β”€ code_generator.py
β”‚Β Β  β”œβ”€β”€ diagnosis.py
β”‚Β Β  β”œβ”€β”€ explainer.py
β”‚Β Β  β”œβ”€β”€ rephraser.py
β”‚Β Β  └── self_debug.py
β”œβ”€β”€ datamodel
β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β  β”‚Β Β  └── amadeus_answer.cpython-39.pyc
β”‚Β Β  └── amadeus_answer.py
β”œβ”€β”€ gui.py
β”œβ”€β”€ implementation.py
β”œβ”€β”€ interface.txt
β”œβ”€β”€ logger.py
β”œβ”€β”€ main.py
β”œβ”€β”€ module_matching.py
β”œβ”€β”€ modules
β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β  β”‚Β Β  └── __init__.cpython-39.pyc
β”‚Β Β  └── implementation
β”‚Β Β      β”œβ”€β”€ __init__.py
β”‚Β Β      β”œβ”€β”€ __pycache__
β”‚Β Β      β”‚Β Β  └── __init__.cpython-39.pyc
β”‚Β Β      β”œβ”€β”€ dataset_io
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β      β”‚Β Β  β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”‚Β Β  β”œβ”€β”€ mabe.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”‚Β Β  └── monkey_reaching.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ mabe.py
β”‚Β Β      β”‚Β Β  └── monkey_reaching.py
β”‚Β Β      β”œβ”€β”€ embedding
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β      β”‚Β Β  β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”‚Β Β  β”œβ”€β”€ cebra.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”‚Β Β  β”œβ”€β”€ transform.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”‚Β Β  └── umap.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ cebra.py
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ transform.py
β”‚Β Β      β”‚Β Β  └── umap.py
β”‚Β Β      β”œβ”€β”€ kinematics
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β      β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β      β”‚Β Β  β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β      β”‚Β Β  β”‚Β Β  └── gait.cpython-39.pyc
β”‚Β Β      β”‚Β Β  └── gait.py
β”‚Β Β      └── visualization
β”‚Β Β          β”œβ”€β”€ __init__.py
β”‚Β Β          β”œβ”€β”€ __pycache__
β”‚Β Β          β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β          β”‚Β Β  β”œβ”€β”€ embedding_plot.cpython-39.pyc
β”‚Β Β          β”‚Β Β  β”œβ”€β”€ ethogram_plot.cpython-39.pyc
β”‚Β Β          β”‚Β Β  β”œβ”€β”€ gait_plot.cpython-39.pyc
β”‚Β Β          β”‚Β Β  └── occupancy_plot.cpython-39.pyc
β”‚Β Β          β”œβ”€β”€ embedding_plot.py
β”‚Β Β          β”œβ”€β”€ ethogram_plot.py
β”‚Β Β          β”œβ”€β”€ gait_plot.py
β”‚Β Β          └── occupancy_plot.py
β”œβ”€β”€ static
β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β  β”‚Β Β  └── __init__.cpython-39.pyc
β”‚Β Β  └── customEPMprompt_short.mp4
β”œβ”€β”€ system_prompts
β”‚Β Β  β”œβ”€β”€ __init__.py
β”‚Β Β  β”œβ”€β”€ __pycache__
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ __init__.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ code_generator.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ diagnosis.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ explainer.cpython-39.pyc
β”‚Β Β  β”‚Β Β  β”œβ”€β”€ rephraser.cpython-39.pyc
β”‚Β Β  β”‚Β Β  └── self_debug.cpython-39.pyc
β”‚Β Β  β”œβ”€β”€ code_generator.py
β”‚Β Β  β”œβ”€β”€ diagnosis.py
β”‚Β Β  β”œβ”€β”€ explainer.py
β”‚Β Β  β”œβ”€β”€ rephraser.py
β”‚Β Β  └── self_debug.py
β”œβ”€β”€ utils.py
└── version.py
  • Need to test launching app with launch_amadeusGPT again; I was having issues with it not being run with streamlit run correctly (note make app still works, but still requires you to locally have the code) ..
(amadeus) ... % launch_amadeusGPT
WARNING streamlit.runtime.caching.cache_data_api: No runtime found, using MemoryCacheStorageManager
WARNING streamlit.runtime.state.session_state_proxy: Session state does not function when running a script without `streamlit run`

@MMathisLab MMathisLab changed the title rehacking app rehacking app, getting towards full pypi mode 🀩 Dec 17, 2023
@MMathisLab MMathisLab merged commit e97720a into main Dec 17, 2023
5 checks passed
@MMathisLab MMathisLab deleted the mwm/hacking branch December 17, 2023 03:33
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

1 participant