Skip to content

Commit

Permalink
Licence and reformatting update
Browse files Browse the repository at this point in the history
  • Loading branch information
Code7G committed Nov 26, 2023
1 parent b55912f commit f8aa83c
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 4 deletions.
3 changes: 3 additions & 0 deletions DAIA.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from DAIA_GPT4V.run import run
from config import openai_api_key
Expand Down
3 changes: 3 additions & 0 deletions DAIA_GPT4V/DVAI/GPT_4_with_Vision.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from openai import OpenAI
import base64
Expand Down
3 changes: 3 additions & 0 deletions DAIA_GPT4V/Memory/memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from sqlalchemy import Column, Integer, String, ForeignKey, create_engine
from sqlalchemy.orm import relationship, sessionmaker, declarative_base
Expand Down
3 changes: 3 additions & 0 deletions DAIA_GPT4V/OS_control/os_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import pyautogui
import platform
Expand Down
10 changes: 6 additions & 4 deletions DAIA_GPT4V/Thinker/thinking.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from DAIA_GPT4V.Memory.memory import Memory
from DAIA_GPT4V.OS_control.os_controller import OSController
Expand All @@ -35,9 +38,9 @@ def __init__(self, key: str, goal: str, goal_id: int):
)

def goal_completer(self, suggestions: str):
''''
"""'
Compleate goals
'''
"""

setup()

Expand Down Expand Up @@ -583,8 +586,7 @@ def save_action(self, action1: str, action2: str, category: int):
Please use the provided context to extract and present the most important data from the input.
""",
)
important_data = self.get_important_data(
full_data, previous_important_data)
important_data = self.get_important_data(full_data, previous_important_data)

# Save the action
new_action = memory.create_action_object(
Expand Down
3 changes: 3 additions & 0 deletions DAIA_GPT4V/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from DAIA_GPT4V.Thinker.thinking import Think
from openai import OpenAI
Expand Down
3 changes: 3 additions & 0 deletions utils/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from pathlib import Path
import os
Expand Down

0 comments on commit f8aa83c

Please sign in to comment.