Merge branch 'main' into feature/audio-narration

Author: abrichr

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 
 
+## v0.25.5 (2024-05-24)
+
+### Fix
+
+* fix(docs): fix typo in README.md (#686) ([`320bb88`](https://github.com/OpenAdaptAI/OpenAdapt/commit/320bb88c4ca64d296f8c38806eecebbd87684896))
+
+
+## v0.25.4 (2024-05-22)
+
+### Fix
+
+* fix(installer): Fix build failing due to replicate and other issues (#684) ([`fdf286c`](https://github.com/OpenAdaptAI/OpenAdapt/commit/fdf286ce69f6c3704dd350e7eff2235026e99bd6))
+
+
+## v0.25.3 (2024-05-22)
+
+### Fix
+
+* fix(installer): add hidden import replicate (#680) ([`6621a04`](https://github.com/OpenAdaptAI/OpenAdapt/commit/6621a04208ab4a076ce0a8175621d1934a0d730e))
+
+
+## v0.25.2 (2024-05-19)
+
+### Fix
+
+* fix(app): add hidden-imports to build spec (#678) ([`d2db305`](https://github.com/OpenAdaptAI/OpenAdapt/commit/d2db30512bc0488df7c250b10fcf45c5025431ec))
+
+
+## v0.25.1 (2024-05-17)
+
+### Fix
+
+* fix(config): Fix path of default config file (#675) ([`9ffdf67`](https://github.com/OpenAdaptAI/OpenAdapt/commit/9ffdf677a2db81d4aac901ba582cdcd2a76ad075))
+
+
 ## v0.25.0 (2024-05-14)
 
 ### Feature

README.md

@@ -97,7 +97,7 @@ cd OpenAdapt
 pip3 install poetry
 poetry install
 poetry shell
-poetry run install-dashbaord
+poetry run install-dashboard
 cd openadapt && alembic upgrade head && cd ..
 pytest
 ```

openadapt/app/dashboard/app/recordings/detail/page.tsx

@@ -6,9 +6,9 @@ import { ActionEvent as ActionEventType } from "@/types/action-event";
 import { Recording as RecordingType } from "@/types/recording";
 import { Box, Loader, Progress } from "@mantine/core";
 import { useSearchParams } from "next/navigation";
-import { useEffect, useState } from "react";
+import { Suspense, useEffect, useState } from "react";
 
-export default function Recording() {
+function Recording() {
     const searchParams = useSearchParams();
     const id = searchParams.get("id");
     const [recordingInfo, setRecordingInfo] = useState<{
@@ -95,3 +95,12 @@ function addIdToNullActionEvent(actionEvent: ActionEventType): ActionEventType {
         children,
     }
 }
+
+
+export default function RecordingPage() {
+    return (
+        <Suspense>
+            <Recording />
+        </Suspense>
+    )
+}

openadapt/build.py

@@ -12,10 +12,12 @@
 import subprocess
 import sys
 
+import gradio_client
 import nicegui
 import oa_pynput
 import pydicom
 import spacy_alignments
+import ultralytics
 
 from openadapt.config import POSTHOG_HOST, POSTHOG_PUBLIC_KEY
 
@@ -30,6 +32,8 @@ def main() -> None:
         oa_pynput,
         pydicom,
         spacy_alignments,
+        gradio_client,
+        ultralytics,
     ]
     if sys.platform == "win32":
         additional_packages_to_install.append(screen_recorder_sdk)
@@ -38,6 +42,10 @@ def main() -> None:
         "py",
     ]
 
+    packages_metadata_to_copy = [
+        "replicate",
+    ]
+
     OPENADAPT_DIR = Path(__file__).parent
     ROOT_DIR = OPENADAPT_DIR.parent
 
@@ -74,6 +82,9 @@ def main() -> None:
         "--onedir",
         # prevent console appearing, only use with ui.run(native=True, ...)
         "--windowed",
+        "--hidden-import=tiktoken_ext.openai_public",
+        "--hidden-import=tiktoken_ext",
+        "--hidden-import=replicate",
     ]
     ignore_dirs = [
         "__pycache__",
@@ -134,13 +145,17 @@ def main() -> None:
         spec.append("--exclude-module")
         spec.append(package)
 
+    for package in packages_metadata_to_copy:
+        spec.append("--copy-metadata")
+        spec.append(package)
+
     subprocess.call(spec)
 
     # building
     proc = subprocess.Popen("pyinstaller OpenAdapt.spec --noconfirm", shell=True)
     proc.wait()
 
-    # # cleanup
+    # cleanup
     os.remove("OpenAdapt.spec")
 
     if sys.platform == "darwin":

openadapt/build_utils.py

@@ -33,14 +33,13 @@ def is_running_from_executable() -> bool:
 class RedirectOutput:
     """Context manager to redirect stdout and stderr to /dev/null."""
 
-    null_stream = open(os.devnull, "a")
-
     def __enter__(self) -> "RedirectOutput":
         """Redirect stdout and stderr to /dev/null."""
         if is_running_from_executable():
+            null_stream = open(os.devnull, "a")
             self.old_stdout = sys.stdout
             self.old_stderr = sys.stderr
-            sys.stdout = sys.stderr = self.null_stream
+            sys.stdout = sys.stderr = null_stream
             return self
 
     def __exit__(self, exc_type: type, exc_value: Exception, traceback: type) -> None:

openadapt/config.py

@@ -18,9 +18,11 @@
 
 from openadapt.build_utils import get_root_dir_path, is_running_from_executable
 
-ROOT_DIR_PATH = get_root_dir_path()
-CONFIG_DEFAULTS_FILE_PATH = (ROOT_DIR_PATH / "config.defaults.json").absolute()
+CONFIG_DEFAULTS_FILE_PATH = (
+    pathlib.Path(__file__).parent / "config.defaults.json"
+).absolute()
 
+ROOT_DIR_PATH = get_root_dir_path()
 DATA_DIR_PATH = (ROOT_DIR_PATH / "data").absolute()
 CONFIG_FILE_PATH = (DATA_DIR_PATH / "config.json").absolute()
 RECORDING_DIR_PATH = (DATA_DIR_PATH / "recordings").absolute()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openadapt"
-version = "0.25.0"
+version = "0.25.5"
 description = "GUI Process Automation with Transformers"
 authors = [
     'OpenAdapt.AI Team <[email protected]>',