Merge branch 'main' into share-magic-wormhole

Author: abrichr

CHANGELOG.md

@@ -2,6 +2,170 @@
 
 
 
+## v0.15.0 (2023-11-11)
+
+### Feature
+
+* feat(openadapt.privacy.providers): add private_ai as a scrubbing provider (#486)
+
+* ran black
+
+* add blank file for priavte ai
+
+* add class `PrivateAIScrubbingProvider`
+
+* add pvt_ai api key in config
+
+* ran `pre-commit run --all`
+
+* add scrub_text function
+
+* progress for image redaction
+
+* format
+
+* complete scrub_image
+
+* start scrub_pdf
+
+* add pdf redaction code
+
+* add more wrapper for invalid reponse from priavate ai
+
+* try to fix pytest
+
+* try to fix pytest
+
+* remove lst
+
+* remove uncessary methods
+
+* text scrubbing test all passses
+
+* pdf_redaction test works
+
+* add test_image_redaction test in pyetst
+
+* add easy ocr to poetry
+
+* pytest is fixed
+
+* remove versino files
+
+* remove un-neccasry files
+
+* add code to remove uncessary files after pytest
+
+* addressed https://github.com/OpenAdaptAI/OpenAdapt/pull/486#discussion_r1312117748
+
+* address comment https://github.com/OpenAdaptAI/OpenAdapt/pull/486#discussion_r1312118632
+
+* reduce line chars
+
+* addressed comment: https://github.com/OpenAdaptAI/OpenAdapt/pull/486#discussion_r1312119001
+
+* fix flake8
+
+* use f strings
+
+* address comment: https://github.com/OpenAdaptAI/OpenAdapt/pull/486#discussion_r1312116014
+
+* address comment: https://github.com/OpenAdaptAI/OpenAdapt/pull/486#discussion_r1312115220
+
+* change to value error
+
+* remove .keys()
+
+* add constants
+
+* fix flake8 erros
+
+* use BytesIO
+
+* address comment https://github.com/OpenAdaptAI/OpenAdapt/pull/486#discussion_r1312114102
+
+* rna black
+
+* final commit
+
+* remove unused code
+
+* refactor typo
+
+* rename `redact_file_path` to `redacted_file_path`
+
+* use BytesIO wherever possible
+
+* fix flake8
+
+* add documentation links
+
+* Apply suggestions from code review
+
+* Update tests/openadapt/privacy/providers/test_private_ai_scrub.py
+
+* fix poetry.lock
+
+* poetry.lock
+
+---------
+
+Co-authored-by: Krish Patel <kmppatel133@gmail.com>
+Co-authored-by: Richard Abrich <richard.abrich@mldsai.com>
+Co-authored-by: Richard Abrich <richard.abrich@gmail.com> ([`396bbb5`](https://github.com/OpenAdaptAI/OpenAdapt/commit/396bbb52fb93ffb720a34396399ac12a85fe1d21))
+
+### Fix
+
+* fix(install): add vs redistributable installation in powershell script (#490)
+
+* VS C++ redist installation
+
+* add VS C++ redist installtion
+
+---------
+
+Co-authored-by: Krish Patel <kmppatel133@gmail.com>
+Co-authored-by: Richard Abrich <richard.abrich@mldsai.com> ([`086a5ca`](https://github.com/OpenAdaptAI/OpenAdapt/commit/086a5ca9a1f98ec58295241faf11b5bb73110c30))
+
+
+## v0.14.0 (2023-11-10)
+
+### Feature
+
+* feat(openadapt.record): implemented notifications on record (#510)
+
+* implemented notifications on record
+
+fixed deprecated/visualize
+
+* fix import ([`22db2dc`](https://github.com/OpenAdaptAI/OpenAdapt/commit/22db2dc7be561f1fd6e35489080779c1d95dc96d))
+
+### Unknown
+
+* Update README.md (#514) ([`f5a22fb`](https://github.com/OpenAdaptAI/OpenAdapt/commit/f5a22fbf0a2d2931216ac28b63b60dc7a8a4c3cb))
+
+* Update LICENSE (#505) ([`97478b7`](https://github.com/OpenAdaptAI/OpenAdapt/commit/97478b7369602d90655b3a211c97fe35d39c5403))
+
+
+## v0.13.2 (2023-10-16)
+
+### Fix
+
+* fix: resolve repository not found error in mac install.sh script (#502)
+
+* Update install_openadapt.sh
+
+* Update install_openadapt.sh ([`eb3c8c3`](https://github.com/OpenAdaptAI/OpenAdapt/commit/eb3c8c397d784285c7b0ed7efbf34ae38f522fed))
+
+### Unknown
+
+* Update README.md (#493)
+
+* Update README.md
+
+replace slack with discord ([`5a6530a`](https://github.com/OpenAdaptAI/OpenAdapt/commit/5a6530a3592ef271652409768ece66bf6183998e))
+
+
 ## v0.13.1 (2023-08-30)
 
 ### Fix

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 MLDSAI Inc., Richard Abrich, and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,4 +1,4 @@
-[Join us on Slack](https://join.slack.com/t/mldsai/shared_invite/zt-1uf94nn7r-qcQnS~hinLPKftUapNzbuw)
+[Join us on Discord](https://discord.gg/yF527cQbDG)
 
 # OpenAdapt: AI-First Process Automation with Transformers
 
@@ -30,7 +30,7 @@ The direction is adjacent to [Adept.ai](https://adept.ai/), with some key differ
 1. OpenAdapt is model agnostic
 2. OpenAdapt generates prompts automatically (auto-prompted, not user-prompted)
 3. OpenAdapt works with all types of desktop GUIs, including virtualized (e.g. Citrix) and web
-4. OpenAdapt is open source! (license TBD, please see https://github.com/OpenAdaptAI/OpenAdapt/issues/246)
+4. OpenAdapt is open source (MIT license)
 
 
 ## Install
@@ -141,7 +141,11 @@ You can play back the recording using the following command:
 python -m openadapt.replay NaiveReplayStrategy
 ```
 
-More ReplayStrategies coming soon! (see [Contributing](#Contributing)).
+Other replay strategies include:
+
+- [`StatefulReplayStrategy`](https://github.com/OpenAdaptAI/OpenAdapt/blob/main/openadapt/strategies/stateful.py): Proof-of-concept which uses the OpenAI GPT-4 API with prompts constructed via OS-level window data.
+
+See https://github.com/OpenAdaptAI/OpenAdapt/tree/main/openadapt/strategies for a complete list. More ReplayStrategies coming soon! (see [Contributing](#Contributing)).
 
 
 ## Contributing
@@ -160,9 +164,10 @@ If it's not clear what `ActionEvent` is appropriate for the given `Screenshot`,
 we can ask the user to take over temporarily to demonstrate the appropriate
 course of action.
 
-### Dataset
+### Data Model
+
+The data model consists of the following entities:
 
-The dataset consists of the following entities:
 1. `Recording`: Contains information about the screen dimensions, platform, and
    other metadata.
 2. `ActionEvent`: Represents a user action event such as a mouse click or key
@@ -174,15 +179,20 @@ The dataset consists of the following entities:
 4. `WindowEvent`: Represents a window event such as a change in window title,
    position, or size.
 
+### API
+
 You can assume that you have access to the following functions:
+
 - `create_recording("doing taxes")`: Creates a recording.
 - `get_latest_recording()`: Gets the latest recording.
 - `get_events(recording)`: Returns a list of `ActionEvent` objects for the given
   recording.
 
+See [GitBook Documentation](https://openadapt.gitbook.io/openadapt.ai/) for more.
+
 ### Instructions
 
-[Join us on Slack](https://join.slack.com/t/mldsai/shared_invite/zt-1uf94nn7r-qcQnS~hinLPKftUapNzbuw). Then:
+[Join us on Discord](https://discord.gg/yF527cQbDG). Then:
 
 1. Fork this repository and clone it to your local machine.
 2. Get OpenAdapt up and running by following the instructions under [Setup](#Setup).

assets/sample_llc_1.pdf

@@ -20,6 +20,10 @@ $gitCmd = "git"
 $gitInstaller = "Git-2.40.1-64-bit.exe"
 $gitInstallerLoc = "https://github.com/git-for-windows/git/releases/download/v2.40.1.windows.1/Git-2.40.1-64-bit.exe"
 $gitUninstaller = "C:\Program Files\Git\unins000.exe"
+
+$VCRedistInstaller = "vc_redist.x64.exe"
+$VCRedistInstallerLoc = "https://aka.ms/vs/17/release/vc_redist.x64.exe"
+$VCRedistRegPath = "HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\X64"
 ################################   PARAMETERS   ################################
 
 
@@ -255,10 +259,42 @@ function GetGitCMD {
     # Return the git command
     return $gitCmd
 }
+
+
+function Install-VCRedist {
+    # Check if Visual C++ Redist is installed
+    try {
+        $vcredistExists = (Get-ItemPropertyValue -Path $VCRedistRegPath -Name Installed -ErrorAction Stop)
+    }
+    catch {
+        $vcredistExists = $false
+    }
+
+    if (!$vcredistExists) {
+        # Install Visual C++ Redist
+        Write-Host "Downloading Visual C++ Redist"
+        $ProgressPreference = 'SilentlyContinue'
+        Invoke-WebRequest -Uri $VCRedistInstallerLoc -OutFile $VCRedistInstaller
+
+        if (-Not (Test-Path -Path $VCRedistInstaller -PathType Leaf)) {
+            Write-Host "Failed to download Visual C++ installer"
+            return
+        }
+
+        Write-Host "Installing Visual C++ Redist, click 'Yes' if prompted for permission"
+        Start-Process -FilePath $VCRedistInstaller -Verb runAs -ArgumentList "/install /quiet /norestart" -Wait
+        Remove-Item $VCRedistInstaller
+
+        if ($LastExitCode) {
+            Write-Host "Failed to install Visual C++ Redist: $LastExitCode"
+            return
+        }
+    }
+}
 ################################   FUNCTIONS    ################################
 
 
-################################   SCRIPT    ################################
+################################   SCRIPT    ###################################
 
 Write-Host "Install Script Started..." -ForegroundColor Yellow
 
@@ -277,6 +313,8 @@ RunAndCheck "$python --version" "check Python"
 $git = GetGitCMD
 RunAndCheck "$git --version" "check Git"
 
+Install-VCRedist
+
 # OpenAdapt Setup
 RunAndCheck "git clone -q https://github.com/MLDSAI/OpenAdapt.git" "clone git repo"
 Set-Location .\OpenAdapt
@@ -287,4 +325,4 @@ RunAndCheck "poetry run pytest" "Run ``Pytest``" -SkipCleanup:$true
 Write-Host "OpenAdapt installed Successfully!" -ForegroundColor Green
 Start-Process powershell -Verb RunAs -ArgumentList "-NoExit", "-Command", "Set-Location -Path '$pwd'; poetry shell"
 
-################################   SCRIPT    ################################
+################################   SCRIPT    ###################################

install/install_openadapt.ps1

@@ -11,7 +11,7 @@ pythonInstallerLoc="https://www.python.org/ftp/python/3.10.11/python-3.10.11-mac
 
 # Set default values when no parameters are provided
 BRANCH=${BRANCH:-main}
-REPO=${REPO:-https://github.com/MLDSAI/OpenAdapt.git}
+REPO=${REPO:-OpenAdaptAI/OpenAdapt.git}
 
 REPO_URL="https://github.com/$REPO"
 

install/install_openadapt.sh

@@ -11,7 +11,7 @@
 
 from openadapt.app.objects.local_file_picker import LocalFilePicker
 from openadapt.app.util import get_scrub, set_dark, set_scrub, sync_switch
-from openadapt.crud import new_session
+from openadapt.db.crud import new_session
 
 record_proc = None
 

openadapt/app/cards.py

@@ -16,7 +16,7 @@
 
 from openadapt.app.cards import quick_record, stop_record
 from openadapt.app.main import FPATH, start
-from openadapt.crud import get_all_recordings
+from openadapt.db.crud import get_all_recordings
 from openadapt.extensions.thread import Thread as oaThread
 from openadapt.models import Recording
 from openadapt.replay import replay

openadapt/app/tray.py

@@ -13,7 +13,7 @@
 from tqdm import tqdm
 
 from openadapt import config
-from openadapt.crud import get_latest_recording
+from openadapt.db.crud import get_latest_recording
 from openadapt.events import get_events
 from openadapt.models import Recording
 from openadapt.privacy.providers.presidio import PresidioScrubbingProvider

openadapt/deprecated/visualize.py

@@ -9,3 +9,4 @@ class ScrubProvider:  # pylint: disable=too-few-public-methods
 
     PRESIDIO = "PRESIDIO"
     COMPREHEND = "COMPREHEND"
+    PRIVATE_AI = "PRIVATE_AI"