Shaokai/fix (#48)

* Corrected typo. Added config yamls in setup

* Removed config files that are no longer needed

* changed work from to pull the repo from git

* Added comments to remind people to pay attentino to data folder in the demo notebooks

* fixed pypi typo

Author: yeshaokai

.github/workflows/pytest.yml

@@ -43,5 +43,5 @@ jobs:
       env:
         OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       run: |
-       pip install '.[streamlit]'
+       pip install git+https://github.com/${{ github.repository }}.git@${{ github.sha }}
        pytest tests --timeout=400

amadeusgpt/configs/Custom_template.yaml

@@ -51,6 +51,8 @@
     "amadeus_root = Path(amadeusgpt.__file__).parent.parent\n",
     "config = Config(amadeus_root / \"amadeusgpt/configs/EPM_template.yaml\")\n",
     "config['video_info']['scene_frame_number'] = scene_frame_number\n",
+    "# if you install from pypi or you used the conda file, you have to adjust the path of data folder to\n",
+    "# repo_root/examples/EPM\n",
     "config['data_info']['data_folder'] = amadeus_root / config['data_info']['data_folder']\n",
     "\n",
     "amadeus = AMADEUS(config)\n",

amadeusgpt/configs/template.yaml

@@ -41,6 +41,8 @@
     "config = Config(amadeus_root / \"amadeusgpt/configs/Horse_template.yaml\")\n",
     "\n",
     "config['video_info']['scene_frame_number'] = scene_frame_number\n",
+    "# if you install from pypi or you used the conda file, you have to adjust the path of data folder to\n",
+    "# repo_root/examples/Horse\n",
     "config['data_info']['data_folder'] = amadeus_root / config['data_info']['data_folder']    \n",
     "\n",
     "amadeus = AMADEUS(config)\n",

conda/amadesuGPT.yml conda/amadeusGPT.ymlconda/amadesuGPT.yml renamed to conda/amadeusGPT.yml

@@ -38,6 +38,8 @@
    "source": [
     "amadeus_root = Path(amadeusgpt.__file__).parent.parent\n",
     "config = Config(amadeus_root / \"amadeusgpt/configs/MABe_template.yaml\")\n",
+    "# if you install from pypi or you used the conda file, you have to adjust the path of data folder to\n",
+    "# repo_root/examples/MABe\n",
     "config['data_info']['data_folder'] = amadeus_root / config['data_info']['data_folder']\n",
     "\n",
     "amadeus = AMADEUS(config)\n",

notebooks/EPM_demo.ipynb

@@ -43,7 +43,8 @@
     "config = Config(amadeus_root / \"amadeusgpt/configs/MausHaus_template.yaml\")\n",
     "\n",
     "config['video_info']['scene_frame_number'] = scene_frame_number\n",
-    "\n",
+    "# if you install from pypi or you used the conda file, you have to adjust the path of data folder to\n",
+    "# repo_root/examples/MausHaus\n",
     "config['data_info']['data_folder'] = amadeus_root / config['data_info']['data_folder']\n",
     "\n",
     "amadeus = AMADEUS(config)\n",

notebooks/Horse_demo.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "f01f49c5",
    "metadata": {},
    "outputs": [],
@@ -15,7 +15,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "bceb3204-2a87-4671-8135-2533a7a51771",
    "metadata": {},
    "outputs": [],
@@ -41,37 +41,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "be76dc87-fbe8-452f-b85c-2af3e95a03bf",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Project created at temp_result_folder. Results will be saved to temp_result_folder\n",
-      "The project will load video files (*..mp4) and optionally keypoint files from temp_data_folder\n",
-      "A copy of the project config file is saved at temp_result_folder/config.yaml\n",
-      "{'data_info': {'data_folder': 'temp_data_folder',\n",
-      "               'result_folder': 'temp_result_folder',\n",
-      "               'video_suffix': '.mp4'},\n",
-      " 'llm_info': {'max_tokens': 4096, 'temperature': 1.0}}\n",
-      "No video files found in the data folder temp_data_folder. Please check the data folder and the video suffix\n"
-     ]
-    },
-    {
-     "ename": "AttributeError",
-     "evalue": "'AMADEUS' object has no attribute 'sandbox'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mAttributeError\u001b[0m                            Traceback (most recent call last)",
-      "Cell \u001b[0;32mIn[3], line 13\u001b[0m\n\u001b[1;32m     10\u001b[0m config[\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mscene_frame_number\u001b[39m\u001b[38;5;124m\"\u001b[39m] \u001b[38;5;241m=\u001b[39m scene_frame_number\n\u001b[1;32m     12\u001b[0m amadeus \u001b[38;5;241m=\u001b[39m AMADEUS(config)\n\u001b[0;32m---> 13\u001b[0m video_file_paths \u001b[38;5;241m=\u001b[39m \u001b[43mamadeus\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mget_video_file_paths\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m     14\u001b[0m \u001b[38;5;28mprint\u001b[39m (video_file_paths)\n",
-      "File \u001b[0;32m~/AmadeusGPT-dev/amadeusgpt/main.py:121\u001b[0m, in \u001b[0;36mAMADEUS.get_video_file_paths\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m    120\u001b[0m \u001b[38;5;28;01mdef\u001b[39;00m \u001b[38;5;21mget_video_file_paths\u001b[39m(\u001b[38;5;28mself\u001b[39m) \u001b[38;5;241m-\u001b[39m\u001b[38;5;241m>\u001b[39m \u001b[38;5;28mlist\u001b[39m[\u001b[38;5;28mstr\u001b[39m]:\n\u001b[0;32m--> 121\u001b[0m     \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43msandbox\u001b[49m\u001b[38;5;241m.\u001b[39mvideo_file_paths\n",
-      "\u001b[0;31mAttributeError\u001b[0m: 'AMADEUS' object has no attribute 'sandbox'"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "scene_frame_number = 400\n",
     "\n",

notebooks/MABe_demo.ipynb

@@ -52,6 +52,10 @@ dev =
     static/*.*
     static/images/*.*
     static/styles/*.*
+    configs/Horse_template.yaml
+    configs/EPM_template.yaml
+    configs/MausHaus_template.yaml
+    configs/MABe_template.yaml
 
 [options.entry_points]
 console_scripts =