From 26a2012020024628d4b9bd4df5b82eb91563df45 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Sun, 27 Oct 2024 09:11:12 -0500 Subject: [PATCH 1/7] still fixing file_path issue --- client-app/src/components/DraftOrcaDashboard.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client-app/src/components/DraftOrcaDashboard.js b/client-app/src/components/DraftOrcaDashboard.js index d1b83c79..e8dee550 100644 --- a/client-app/src/components/DraftOrcaDashboard.js +++ b/client-app/src/components/DraftOrcaDashboard.js @@ -24,7 +24,7 @@ const DraftOrcaDashboard = () => { return; } setSelectedFile(selectedFile); - setFileName(selectedFile.name.split("/").pop()); + setFileName(selectedFile.path); }; const isSearchQueryEnabled = () => { @@ -76,8 +76,8 @@ const DraftOrcaDashboard = () => { axios .post("http://localhost:5001/upload", formData) .then((response) => { - const uploadedFileName = response.data.filename.split("/").pop(); - setFileName(uploadedFileName); + //const uploadedFileName = response.data.filename.split("/").pop(); + setFileName(response.data.file_path); setUploadedFiles((prevUploadedFiles) => [...prevUploadedFiles, uploadedFileName]); }) .catch((error) => { @@ -97,7 +97,7 @@ const DraftOrcaDashboard = () => { } const data = { - file_path: fileName.toString(), + file_path: fileName, search_terms: searchTerms, sections: sections, specify_lines: specifyLines.join(","), From ec6d876b9db4fdd74509696b64d45610691096d2 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:29:32 -0500 Subject: [PATCH 2/7] issue#62 completed --- .../src/components/DraftOrcaDashboard.js | 8 +- server/ven/bin/Activate.ps1 | 247 ++++++++++++++++++ server/ven/bin/activate | 69 +++++ server/ven/bin/activate.csh | 26 ++ server/ven/bin/activate.fish | 69 +++++ server/ven/bin/coverage | 8 + server/ven/bin/coverage-3.11 | 8 + server/ven/bin/coverage3 | 8 + server/ven/bin/flask | 8 + server/ven/bin/pip | 8 + server/ven/bin/pip3 | 8 + server/ven/bin/pip3.11 | 8 + server/ven/bin/py.test | 8 + server/ven/bin/pytest | 8 + server/ven/bin/python | 1 + server/ven/bin/python3 | 1 + server/ven/bin/python3.11 | 1 + server/ven/pyvenv.cfg | 5 + 18 files changed, 495 insertions(+), 4 deletions(-) create mode 100644 server/ven/bin/Activate.ps1 create mode 100644 server/ven/bin/activate create mode 100644 server/ven/bin/activate.csh create mode 100644 server/ven/bin/activate.fish create mode 100755 server/ven/bin/coverage create mode 100755 server/ven/bin/coverage-3.11 create mode 100755 server/ven/bin/coverage3 create mode 100755 server/ven/bin/flask create mode 100755 server/ven/bin/pip create mode 100755 server/ven/bin/pip3 create mode 100755 server/ven/bin/pip3.11 create mode 100755 server/ven/bin/py.test create mode 100755 server/ven/bin/pytest create mode 120000 server/ven/bin/python create mode 120000 server/ven/bin/python3 create mode 120000 server/ven/bin/python3.11 create mode 100644 server/ven/pyvenv.cfg diff --git a/client-app/src/components/DraftOrcaDashboard.js b/client-app/src/components/DraftOrcaDashboard.js index e8dee550..39d4742e 100644 --- a/client-app/src/components/DraftOrcaDashboard.js +++ b/client-app/src/components/DraftOrcaDashboard.js @@ -24,7 +24,7 @@ const DraftOrcaDashboard = () => { return; } setSelectedFile(selectedFile); - setFileName(selectedFile.path); + setFileName(selectedFile.name.split("/").pop()); }; const isSearchQueryEnabled = () => { @@ -76,8 +76,8 @@ const DraftOrcaDashboard = () => { axios .post("http://localhost:5001/upload", formData) .then((response) => { - //const uploadedFileName = response.data.filename.split("/").pop(); - setFileName(response.data.file_path); + const uploadedFileName = response.data.filename.split("/").pop(); + setFileName(response.data.filename); setUploadedFiles((prevUploadedFiles) => [...prevUploadedFiles, uploadedFileName]); }) .catch((error) => { @@ -97,7 +97,7 @@ const DraftOrcaDashboard = () => { } const data = { - file_path: fileName, + file_path: fileName.toString(), search_terms: searchTerms, sections: sections, specify_lines: specifyLines.join(","), diff --git a/server/ven/bin/Activate.ps1 b/server/ven/bin/Activate.ps1 new file mode 100644 index 00000000..b49d77ba --- /dev/null +++ b/server/ven/bin/Activate.ps1 @@ -0,0 +1,247 @@ +<# +.Synopsis +Activate a Python virtual environment for the current PowerShell session. + +.Description +Pushes the python executable for a virtual environment to the front of the +$Env:PATH environment variable and sets the prompt to signify that you are +in a Python virtual environment. Makes use of the command line switches as +well as the `pyvenv.cfg` file values present in the virtual environment. + +.Parameter VenvDir +Path to the directory that contains the virtual environment to activate. The +default value for this is the parent of the directory that the Activate.ps1 +script is located within. + +.Parameter Prompt +The prompt prefix to display when this virtual environment is activated. By +default, this prompt is the name of the virtual environment folder (VenvDir) +surrounded by parentheses and followed by a single space (ie. '(.venv) '). + +.Example +Activate.ps1 +Activates the Python virtual environment that contains the Activate.ps1 script. + +.Example +Activate.ps1 -Verbose +Activates the Python virtual environment that contains the Activate.ps1 script, +and shows extra information about the activation as it executes. + +.Example +Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv +Activates the Python virtual environment located in the specified location. + +.Example +Activate.ps1 -Prompt "MyPython" +Activates the Python virtual environment that contains the Activate.ps1 script, +and prefixes the current prompt with the specified string (surrounded in +parentheses) while the virtual environment is active. + +.Notes +On Windows, it may be required to enable this Activate.ps1 script by setting the +execution policy for the user. You can do this by issuing the following PowerShell +command: + +PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + +For more information on Execution Policies: +https://go.microsoft.com/fwlink/?LinkID=135170 + +#> +Param( + [Parameter(Mandatory = $false)] + [String] + $VenvDir, + [Parameter(Mandatory = $false)] + [String] + $Prompt +) + +<# Function declarations --------------------------------------------------- #> + +<# +.Synopsis +Remove all shell session elements added by the Activate script, including the +addition of the virtual environment's Python executable from the beginning of +the PATH variable. + +.Parameter NonDestructive +If present, do not remove this function from the global namespace for the +session. + +#> +function global:deactivate ([switch]$NonDestructive) { + # Revert to original values + + # The prior prompt: + if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) { + Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt + Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT + } + + # The prior PYTHONHOME: + if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) { + Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME + Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME + } + + # The prior PATH: + if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) { + Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH + Remove-Item -Path Env:_OLD_VIRTUAL_PATH + } + + # Just remove the VIRTUAL_ENV altogether: + if (Test-Path -Path Env:VIRTUAL_ENV) { + Remove-Item -Path env:VIRTUAL_ENV + } + + # Just remove VIRTUAL_ENV_PROMPT altogether. + if (Test-Path -Path Env:VIRTUAL_ENV_PROMPT) { + Remove-Item -Path env:VIRTUAL_ENV_PROMPT + } + + # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: + if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { + Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force + } + + # Leave deactivate function in the global namespace if requested: + if (-not $NonDestructive) { + Remove-Item -Path function:deactivate + } +} + +<# +.Description +Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the +given folder, and returns them in a map. + +For each line in the pyvenv.cfg file, if that line can be parsed into exactly +two strings separated by `=` (with any amount of whitespace surrounding the =) +then it is considered a `key = value` line. The left hand string is the key, +the right hand is the value. + +If the value starts with a `'` or a `"` then the first and last character is +stripped from the value before being captured. + +.Parameter ConfigDir +Path to the directory that contains the `pyvenv.cfg` file. +#> +function Get-PyVenvConfig( + [String] + $ConfigDir +) { + Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg" + + # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue). + $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue + + # An empty map will be returned if no config file is found. + $pyvenvConfig = @{ } + + if ($pyvenvConfigPath) { + + Write-Verbose "File exists, parse `key = value` lines" + $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath + + $pyvenvConfigContent | ForEach-Object { + $keyval = $PSItem -split "\s*=\s*", 2 + if ($keyval[0] -and $keyval[1]) { + $val = $keyval[1] + + # Remove extraneous quotations around a string value. + if ("'""".Contains($val.Substring(0, 1))) { + $val = $val.Substring(1, $val.Length - 2) + } + + $pyvenvConfig[$keyval[0]] = $val + Write-Verbose "Adding Key: '$($keyval[0])'='$val'" + } + } + } + return $pyvenvConfig +} + + +<# Begin Activate script --------------------------------------------------- #> + +# Determine the containing directory of this script +$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition +$VenvExecDir = Get-Item -Path $VenvExecPath + +Write-Verbose "Activation script is located in path: '$VenvExecPath'" +Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)" +Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)" + +# Set values required in priority: CmdLine, ConfigFile, Default +# First, get the location of the virtual environment, it might not be +# VenvExecDir if specified on the command line. +if ($VenvDir) { + Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values" +} +else { + Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir." + $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/") + Write-Verbose "VenvDir=$VenvDir" +} + +# Next, read the `pyvenv.cfg` file to determine any required value such +# as `prompt`. +$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir + +# Next, set the prompt from the command line, or the config file, or +# just use the name of the virtual environment folder. +if ($Prompt) { + Write-Verbose "Prompt specified as argument, using '$Prompt'" +} +else { + Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value" + if ($pyvenvCfg -and $pyvenvCfg['prompt']) { + Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'" + $Prompt = $pyvenvCfg['prompt']; + } + else { + Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virtual environment)" + Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" + $Prompt = Split-Path -Path $venvDir -Leaf + } +} + +Write-Verbose "Prompt = '$Prompt'" +Write-Verbose "VenvDir='$VenvDir'" + +# Deactivate any currently active virtual environment, but leave the +# deactivate function in place. +deactivate -nondestructive + +# Now set the environment variable VIRTUAL_ENV, used by many tools to determine +# that there is an activated venv. +$env:VIRTUAL_ENV = $VenvDir + +if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { + + Write-Verbose "Setting prompt to '$Prompt'" + + # Set the prompt to include the env name + # Make sure _OLD_VIRTUAL_PROMPT is global + function global:_OLD_VIRTUAL_PROMPT { "" } + Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT + New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt + + function global:prompt { + Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " + _OLD_VIRTUAL_PROMPT + } + $env:VIRTUAL_ENV_PROMPT = $Prompt +} + +# Clear PYTHONHOME +if (Test-Path -Path Env:PYTHONHOME) { + Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME + Remove-Item -Path Env:PYTHONHOME +} + +# Add the venv to the PATH +Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH +$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH" diff --git a/server/ven/bin/activate b/server/ven/bin/activate new file mode 100644 index 00000000..393c1643 --- /dev/null +++ b/server/ven/bin/activate @@ -0,0 +1,69 @@ +# This file must be used with "source bin/activate" *from bash* +# you cannot run it directly + +deactivate () { + # reset old environment variables + if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then + PATH="${_OLD_VIRTUAL_PATH:-}" + export PATH + unset _OLD_VIRTUAL_PATH + fi + if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then + PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" + export PYTHONHOME + unset _OLD_VIRTUAL_PYTHONHOME + fi + + # This should detect bash and zsh, which have a hash command that must + # be called to get it to forget past commands. Without forgetting + # past commands the $PATH changes we made may not be respected + if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then + hash -r 2> /dev/null + fi + + if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then + PS1="${_OLD_VIRTUAL_PS1:-}" + export PS1 + unset _OLD_VIRTUAL_PS1 + fi + + unset VIRTUAL_ENV + unset VIRTUAL_ENV_PROMPT + if [ ! "${1:-}" = "nondestructive" ] ; then + # Self destruct! + unset -f deactivate + fi +} + +# unset irrelevant variables +deactivate nondestructive + +VIRTUAL_ENV="/Users/medhani/Capstone/esp/server/ven" +export VIRTUAL_ENV + +_OLD_VIRTUAL_PATH="$PATH" +PATH="$VIRTUAL_ENV/bin:$PATH" +export PATH + +# unset PYTHONHOME if set +# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) +# could use `if (set -u; : $PYTHONHOME) ;` in bash +if [ -n "${PYTHONHOME:-}" ] ; then + _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" + unset PYTHONHOME +fi + +if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1:-}" + PS1="(ven) ${PS1:-}" + export PS1 + VIRTUAL_ENV_PROMPT="(ven) " + export VIRTUAL_ENV_PROMPT +fi + +# This should detect bash and zsh, which have a hash command that must +# be called to get it to forget past commands. Without forgetting +# past commands the $PATH changes we made may not be respected +if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then + hash -r 2> /dev/null +fi diff --git a/server/ven/bin/activate.csh b/server/ven/bin/activate.csh new file mode 100644 index 00000000..c5545228 --- /dev/null +++ b/server/ven/bin/activate.csh @@ -0,0 +1,26 @@ +# This file must be used with "source bin/activate.csh" *from csh*. +# You cannot run it directly. +# Created by Davide Di Blasi . +# Ported to Python 3.3 venv by Andrew Svetlov + +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; unsetenv VIRTUAL_ENV_PROMPT; test "\!:*" != "nondestructive" && unalias deactivate' + +# Unset irrelevant variables. +deactivate nondestructive + +setenv VIRTUAL_ENV "/Users/medhani/Capstone/esp/server/ven" + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/bin:$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + set prompt = "(ven) $prompt" + setenv VIRTUAL_ENV_PROMPT "(ven) " +endif + +alias pydoc python -m pydoc + +rehash diff --git a/server/ven/bin/activate.fish b/server/ven/bin/activate.fish new file mode 100644 index 00000000..f9347f4a --- /dev/null +++ b/server/ven/bin/activate.fish @@ -0,0 +1,69 @@ +# This file must be used with "source /bin/activate.fish" *from fish* +# (https://fishshell.com/); you cannot run it directly. + +function deactivate -d "Exit virtual environment and return to normal shell environment" + # reset old environment variables + if test -n "$_OLD_VIRTUAL_PATH" + set -gx PATH $_OLD_VIRTUAL_PATH + set -e _OLD_VIRTUAL_PATH + end + if test -n "$_OLD_VIRTUAL_PYTHONHOME" + set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME + set -e _OLD_VIRTUAL_PYTHONHOME + end + + if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + set -e _OLD_FISH_PROMPT_OVERRIDE + # prevents error when using nested fish instances (Issue #93858) + if functions -q _old_fish_prompt + functions -e fish_prompt + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt + end + end + + set -e VIRTUAL_ENV + set -e VIRTUAL_ENV_PROMPT + if test "$argv[1]" != "nondestructive" + # Self-destruct! + functions -e deactivate + end +end + +# Unset irrelevant variables. +deactivate nondestructive + +set -gx VIRTUAL_ENV "/Users/medhani/Capstone/esp/server/ven" + +set -gx _OLD_VIRTUAL_PATH $PATH +set -gx PATH "$VIRTUAL_ENV/bin" $PATH + +# Unset PYTHONHOME if set. +if set -q PYTHONHOME + set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME + set -e PYTHONHOME +end + +if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + # fish uses a function instead of an env var to generate the prompt. + + # Save the current fish_prompt function as the function _old_fish_prompt. + functions -c fish_prompt _old_fish_prompt + + # With the original prompt function renamed, we can override with our own. + function fish_prompt + # Save the return status of the last command. + set -l old_status $status + + # Output the venv prompt; color taken from the blue of the Python logo. + printf "%s%s%s" (set_color 4B8BBE) "(ven) " (set_color normal) + + # Restore the return status of the previous command. + echo "exit $old_status" | . + # Output the original/"old" prompt. + _old_fish_prompt + end + + set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" + set -gx VIRTUAL_ENV_PROMPT "(ven) " +end diff --git a/server/ven/bin/coverage b/server/ven/bin/coverage new file mode 100755 index 00000000..6b65ee74 --- /dev/null +++ b/server/ven/bin/coverage @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from coverage.cmdline import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/coverage-3.11 b/server/ven/bin/coverage-3.11 new file mode 100755 index 00000000..6b65ee74 --- /dev/null +++ b/server/ven/bin/coverage-3.11 @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from coverage.cmdline import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/coverage3 b/server/ven/bin/coverage3 new file mode 100755 index 00000000..6b65ee74 --- /dev/null +++ b/server/ven/bin/coverage3 @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from coverage.cmdline import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/flask b/server/ven/bin/flask new file mode 100755 index 00000000..d21eb72e --- /dev/null +++ b/server/ven/bin/flask @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from flask.cli import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/pip b/server/ven/bin/pip new file mode 100755 index 00000000..9da46430 --- /dev/null +++ b/server/ven/bin/pip @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/pip3 b/server/ven/bin/pip3 new file mode 100755 index 00000000..9da46430 --- /dev/null +++ b/server/ven/bin/pip3 @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/pip3.11 b/server/ven/bin/pip3.11 new file mode 100755 index 00000000..9da46430 --- /dev/null +++ b/server/ven/bin/pip3.11 @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/server/ven/bin/py.test b/server/ven/bin/py.test new file mode 100755 index 00000000..1dbc57b3 --- /dev/null +++ b/server/ven/bin/py.test @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from pytest import console_main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(console_main()) diff --git a/server/ven/bin/pytest b/server/ven/bin/pytest new file mode 100755 index 00000000..1dbc57b3 --- /dev/null +++ b/server/ven/bin/pytest @@ -0,0 +1,8 @@ +#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 +# -*- coding: utf-8 -*- +import re +import sys +from pytest import console_main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(console_main()) diff --git a/server/ven/bin/python b/server/ven/bin/python new file mode 120000 index 00000000..6e7f3c7d --- /dev/null +++ b/server/ven/bin/python @@ -0,0 +1 @@ +python3.11 \ No newline at end of file diff --git a/server/ven/bin/python3 b/server/ven/bin/python3 new file mode 120000 index 00000000..6e7f3c7d --- /dev/null +++ b/server/ven/bin/python3 @@ -0,0 +1 @@ +python3.11 \ No newline at end of file diff --git a/server/ven/bin/python3.11 b/server/ven/bin/python3.11 new file mode 120000 index 00000000..2d175777 --- /dev/null +++ b/server/ven/bin/python3.11 @@ -0,0 +1 @@ +/Library/Frameworks/Python.framework/Versions/3.11/bin/python3.11 \ No newline at end of file diff --git a/server/ven/pyvenv.cfg b/server/ven/pyvenv.cfg new file mode 100644 index 00000000..773389b1 --- /dev/null +++ b/server/ven/pyvenv.cfg @@ -0,0 +1,5 @@ +home = /Library/Frameworks/Python.framework/Versions/3.11/bin +include-system-site-packages = false +version = 3.11.4 +executable = /Library/Frameworks/Python.framework/Versions/3.11/bin/python3.11 +command = /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m venv /Users/medhani/Capstone/esp/server/ven From 7f5128994af4a6063a820500b17c5b035a9e7ddd Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:03:27 -0500 Subject: [PATCH 3/7] ensuring selectFile and uploadedFileName are compatible with windows as well as mac --- client-app/src/components/DraftOrcaDashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client-app/src/components/DraftOrcaDashboard.js b/client-app/src/components/DraftOrcaDashboard.js index 39d4742e..80128152 100644 --- a/client-app/src/components/DraftOrcaDashboard.js +++ b/client-app/src/components/DraftOrcaDashboard.js @@ -24,7 +24,7 @@ const DraftOrcaDashboard = () => { return; } setSelectedFile(selectedFile); - setFileName(selectedFile.name.split("/").pop()); + setFileName(selectedFile.name.split(/[/\\]/).pop()); }; const isSearchQueryEnabled = () => { @@ -76,7 +76,7 @@ const DraftOrcaDashboard = () => { axios .post("http://localhost:5001/upload", formData) .then((response) => { - const uploadedFileName = response.data.filename.split("/").pop(); + const uploadedFileName = response.data.filename.split(/[/\\]/).pop(); setFileName(response.data.filename); setUploadedFiles((prevUploadedFiles) => [...prevUploadedFiles, uploadedFileName]); }) From c18681658b8dd57134e663c5daed154ec64744df Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:48:54 -0500 Subject: [PATCH 4/7] deleting ven folder --- server/ven/bin/Activate.ps1 | 247 ----------------------------------- server/ven/bin/activate | 69 ---------- server/ven/bin/activate.csh | 26 ---- server/ven/bin/activate.fish | 69 ---------- server/ven/bin/coverage | 8 -- server/ven/bin/coverage-3.11 | 8 -- server/ven/bin/coverage3 | 8 -- server/ven/bin/flask | 8 -- server/ven/bin/pip | 8 -- server/ven/bin/pip3 | 8 -- server/ven/bin/pip3.11 | 8 -- server/ven/bin/py.test | 8 -- server/ven/bin/pytest | 8 -- server/ven/bin/python | 1 - server/ven/bin/python3 | 1 - server/ven/bin/python3.11 | 1 - server/ven/pyvenv.cfg | 5 - 17 files changed, 491 deletions(-) delete mode 100644 server/ven/bin/Activate.ps1 delete mode 100644 server/ven/bin/activate delete mode 100644 server/ven/bin/activate.csh delete mode 100644 server/ven/bin/activate.fish delete mode 100755 server/ven/bin/coverage delete mode 100755 server/ven/bin/coverage-3.11 delete mode 100755 server/ven/bin/coverage3 delete mode 100755 server/ven/bin/flask delete mode 100755 server/ven/bin/pip delete mode 100755 server/ven/bin/pip3 delete mode 100755 server/ven/bin/pip3.11 delete mode 100755 server/ven/bin/py.test delete mode 100755 server/ven/bin/pytest delete mode 120000 server/ven/bin/python delete mode 120000 server/ven/bin/python3 delete mode 120000 server/ven/bin/python3.11 delete mode 100644 server/ven/pyvenv.cfg diff --git a/server/ven/bin/Activate.ps1 b/server/ven/bin/Activate.ps1 deleted file mode 100644 index b49d77ba..00000000 --- a/server/ven/bin/Activate.ps1 +++ /dev/null @@ -1,247 +0,0 @@ -<# -.Synopsis -Activate a Python virtual environment for the current PowerShell session. - -.Description -Pushes the python executable for a virtual environment to the front of the -$Env:PATH environment variable and sets the prompt to signify that you are -in a Python virtual environment. Makes use of the command line switches as -well as the `pyvenv.cfg` file values present in the virtual environment. - -.Parameter VenvDir -Path to the directory that contains the virtual environment to activate. The -default value for this is the parent of the directory that the Activate.ps1 -script is located within. - -.Parameter Prompt -The prompt prefix to display when this virtual environment is activated. By -default, this prompt is the name of the virtual environment folder (VenvDir) -surrounded by parentheses and followed by a single space (ie. '(.venv) '). - -.Example -Activate.ps1 -Activates the Python virtual environment that contains the Activate.ps1 script. - -.Example -Activate.ps1 -Verbose -Activates the Python virtual environment that contains the Activate.ps1 script, -and shows extra information about the activation as it executes. - -.Example -Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv -Activates the Python virtual environment located in the specified location. - -.Example -Activate.ps1 -Prompt "MyPython" -Activates the Python virtual environment that contains the Activate.ps1 script, -and prefixes the current prompt with the specified string (surrounded in -parentheses) while the virtual environment is active. - -.Notes -On Windows, it may be required to enable this Activate.ps1 script by setting the -execution policy for the user. You can do this by issuing the following PowerShell -command: - -PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser - -For more information on Execution Policies: -https://go.microsoft.com/fwlink/?LinkID=135170 - -#> -Param( - [Parameter(Mandatory = $false)] - [String] - $VenvDir, - [Parameter(Mandatory = $false)] - [String] - $Prompt -) - -<# Function declarations --------------------------------------------------- #> - -<# -.Synopsis -Remove all shell session elements added by the Activate script, including the -addition of the virtual environment's Python executable from the beginning of -the PATH variable. - -.Parameter NonDestructive -If present, do not remove this function from the global namespace for the -session. - -#> -function global:deactivate ([switch]$NonDestructive) { - # Revert to original values - - # The prior prompt: - if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) { - Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt - Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT - } - - # The prior PYTHONHOME: - if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) { - Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME - Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME - } - - # The prior PATH: - if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) { - Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH - Remove-Item -Path Env:_OLD_VIRTUAL_PATH - } - - # Just remove the VIRTUAL_ENV altogether: - if (Test-Path -Path Env:VIRTUAL_ENV) { - Remove-Item -Path env:VIRTUAL_ENV - } - - # Just remove VIRTUAL_ENV_PROMPT altogether. - if (Test-Path -Path Env:VIRTUAL_ENV_PROMPT) { - Remove-Item -Path env:VIRTUAL_ENV_PROMPT - } - - # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: - if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { - Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force - } - - # Leave deactivate function in the global namespace if requested: - if (-not $NonDestructive) { - Remove-Item -Path function:deactivate - } -} - -<# -.Description -Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the -given folder, and returns them in a map. - -For each line in the pyvenv.cfg file, if that line can be parsed into exactly -two strings separated by `=` (with any amount of whitespace surrounding the =) -then it is considered a `key = value` line. The left hand string is the key, -the right hand is the value. - -If the value starts with a `'` or a `"` then the first and last character is -stripped from the value before being captured. - -.Parameter ConfigDir -Path to the directory that contains the `pyvenv.cfg` file. -#> -function Get-PyVenvConfig( - [String] - $ConfigDir -) { - Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg" - - # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue). - $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue - - # An empty map will be returned if no config file is found. - $pyvenvConfig = @{ } - - if ($pyvenvConfigPath) { - - Write-Verbose "File exists, parse `key = value` lines" - $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath - - $pyvenvConfigContent | ForEach-Object { - $keyval = $PSItem -split "\s*=\s*", 2 - if ($keyval[0] -and $keyval[1]) { - $val = $keyval[1] - - # Remove extraneous quotations around a string value. - if ("'""".Contains($val.Substring(0, 1))) { - $val = $val.Substring(1, $val.Length - 2) - } - - $pyvenvConfig[$keyval[0]] = $val - Write-Verbose "Adding Key: '$($keyval[0])'='$val'" - } - } - } - return $pyvenvConfig -} - - -<# Begin Activate script --------------------------------------------------- #> - -# Determine the containing directory of this script -$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition -$VenvExecDir = Get-Item -Path $VenvExecPath - -Write-Verbose "Activation script is located in path: '$VenvExecPath'" -Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)" -Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)" - -# Set values required in priority: CmdLine, ConfigFile, Default -# First, get the location of the virtual environment, it might not be -# VenvExecDir if specified on the command line. -if ($VenvDir) { - Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values" -} -else { - Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir." - $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/") - Write-Verbose "VenvDir=$VenvDir" -} - -# Next, read the `pyvenv.cfg` file to determine any required value such -# as `prompt`. -$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir - -# Next, set the prompt from the command line, or the config file, or -# just use the name of the virtual environment folder. -if ($Prompt) { - Write-Verbose "Prompt specified as argument, using '$Prompt'" -} -else { - Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value" - if ($pyvenvCfg -and $pyvenvCfg['prompt']) { - Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'" - $Prompt = $pyvenvCfg['prompt']; - } - else { - Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virtual environment)" - Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" - $Prompt = Split-Path -Path $venvDir -Leaf - } -} - -Write-Verbose "Prompt = '$Prompt'" -Write-Verbose "VenvDir='$VenvDir'" - -# Deactivate any currently active virtual environment, but leave the -# deactivate function in place. -deactivate -nondestructive - -# Now set the environment variable VIRTUAL_ENV, used by many tools to determine -# that there is an activated venv. -$env:VIRTUAL_ENV = $VenvDir - -if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { - - Write-Verbose "Setting prompt to '$Prompt'" - - # Set the prompt to include the env name - # Make sure _OLD_VIRTUAL_PROMPT is global - function global:_OLD_VIRTUAL_PROMPT { "" } - Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT - New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt - - function global:prompt { - Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " - _OLD_VIRTUAL_PROMPT - } - $env:VIRTUAL_ENV_PROMPT = $Prompt -} - -# Clear PYTHONHOME -if (Test-Path -Path Env:PYTHONHOME) { - Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME - Remove-Item -Path Env:PYTHONHOME -} - -# Add the venv to the PATH -Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH -$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH" diff --git a/server/ven/bin/activate b/server/ven/bin/activate deleted file mode 100644 index 393c1643..00000000 --- a/server/ven/bin/activate +++ /dev/null @@ -1,69 +0,0 @@ -# This file must be used with "source bin/activate" *from bash* -# you cannot run it directly - -deactivate () { - # reset old environment variables - if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then - PATH="${_OLD_VIRTUAL_PATH:-}" - export PATH - unset _OLD_VIRTUAL_PATH - fi - if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then - PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" - export PYTHONHOME - unset _OLD_VIRTUAL_PYTHONHOME - fi - - # This should detect bash and zsh, which have a hash command that must - # be called to get it to forget past commands. Without forgetting - # past commands the $PATH changes we made may not be respected - if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then - hash -r 2> /dev/null - fi - - if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then - PS1="${_OLD_VIRTUAL_PS1:-}" - export PS1 - unset _OLD_VIRTUAL_PS1 - fi - - unset VIRTUAL_ENV - unset VIRTUAL_ENV_PROMPT - if [ ! "${1:-}" = "nondestructive" ] ; then - # Self destruct! - unset -f deactivate - fi -} - -# unset irrelevant variables -deactivate nondestructive - -VIRTUAL_ENV="/Users/medhani/Capstone/esp/server/ven" -export VIRTUAL_ENV - -_OLD_VIRTUAL_PATH="$PATH" -PATH="$VIRTUAL_ENV/bin:$PATH" -export PATH - -# unset PYTHONHOME if set -# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) -# could use `if (set -u; : $PYTHONHOME) ;` in bash -if [ -n "${PYTHONHOME:-}" ] ; then - _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" - unset PYTHONHOME -fi - -if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then - _OLD_VIRTUAL_PS1="${PS1:-}" - PS1="(ven) ${PS1:-}" - export PS1 - VIRTUAL_ENV_PROMPT="(ven) " - export VIRTUAL_ENV_PROMPT -fi - -# This should detect bash and zsh, which have a hash command that must -# be called to get it to forget past commands. Without forgetting -# past commands the $PATH changes we made may not be respected -if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then - hash -r 2> /dev/null -fi diff --git a/server/ven/bin/activate.csh b/server/ven/bin/activate.csh deleted file mode 100644 index c5545228..00000000 --- a/server/ven/bin/activate.csh +++ /dev/null @@ -1,26 +0,0 @@ -# This file must be used with "source bin/activate.csh" *from csh*. -# You cannot run it directly. -# Created by Davide Di Blasi . -# Ported to Python 3.3 venv by Andrew Svetlov - -alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; unsetenv VIRTUAL_ENV_PROMPT; test "\!:*" != "nondestructive" && unalias deactivate' - -# Unset irrelevant variables. -deactivate nondestructive - -setenv VIRTUAL_ENV "/Users/medhani/Capstone/esp/server/ven" - -set _OLD_VIRTUAL_PATH="$PATH" -setenv PATH "$VIRTUAL_ENV/bin:$PATH" - - -set _OLD_VIRTUAL_PROMPT="$prompt" - -if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then - set prompt = "(ven) $prompt" - setenv VIRTUAL_ENV_PROMPT "(ven) " -endif - -alias pydoc python -m pydoc - -rehash diff --git a/server/ven/bin/activate.fish b/server/ven/bin/activate.fish deleted file mode 100644 index f9347f4a..00000000 --- a/server/ven/bin/activate.fish +++ /dev/null @@ -1,69 +0,0 @@ -# This file must be used with "source /bin/activate.fish" *from fish* -# (https://fishshell.com/); you cannot run it directly. - -function deactivate -d "Exit virtual environment and return to normal shell environment" - # reset old environment variables - if test -n "$_OLD_VIRTUAL_PATH" - set -gx PATH $_OLD_VIRTUAL_PATH - set -e _OLD_VIRTUAL_PATH - end - if test -n "$_OLD_VIRTUAL_PYTHONHOME" - set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME - set -e _OLD_VIRTUAL_PYTHONHOME - end - - if test -n "$_OLD_FISH_PROMPT_OVERRIDE" - set -e _OLD_FISH_PROMPT_OVERRIDE - # prevents error when using nested fish instances (Issue #93858) - if functions -q _old_fish_prompt - functions -e fish_prompt - functions -c _old_fish_prompt fish_prompt - functions -e _old_fish_prompt - end - end - - set -e VIRTUAL_ENV - set -e VIRTUAL_ENV_PROMPT - if test "$argv[1]" != "nondestructive" - # Self-destruct! - functions -e deactivate - end -end - -# Unset irrelevant variables. -deactivate nondestructive - -set -gx VIRTUAL_ENV "/Users/medhani/Capstone/esp/server/ven" - -set -gx _OLD_VIRTUAL_PATH $PATH -set -gx PATH "$VIRTUAL_ENV/bin" $PATH - -# Unset PYTHONHOME if set. -if set -q PYTHONHOME - set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME - set -e PYTHONHOME -end - -if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" - # fish uses a function instead of an env var to generate the prompt. - - # Save the current fish_prompt function as the function _old_fish_prompt. - functions -c fish_prompt _old_fish_prompt - - # With the original prompt function renamed, we can override with our own. - function fish_prompt - # Save the return status of the last command. - set -l old_status $status - - # Output the venv prompt; color taken from the blue of the Python logo. - printf "%s%s%s" (set_color 4B8BBE) "(ven) " (set_color normal) - - # Restore the return status of the previous command. - echo "exit $old_status" | . - # Output the original/"old" prompt. - _old_fish_prompt - end - - set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" - set -gx VIRTUAL_ENV_PROMPT "(ven) " -end diff --git a/server/ven/bin/coverage b/server/ven/bin/coverage deleted file mode 100755 index 6b65ee74..00000000 --- a/server/ven/bin/coverage +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from coverage.cmdline import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/coverage-3.11 b/server/ven/bin/coverage-3.11 deleted file mode 100755 index 6b65ee74..00000000 --- a/server/ven/bin/coverage-3.11 +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from coverage.cmdline import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/coverage3 b/server/ven/bin/coverage3 deleted file mode 100755 index 6b65ee74..00000000 --- a/server/ven/bin/coverage3 +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from coverage.cmdline import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/flask b/server/ven/bin/flask deleted file mode 100755 index d21eb72e..00000000 --- a/server/ven/bin/flask +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from flask.cli import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/pip b/server/ven/bin/pip deleted file mode 100755 index 9da46430..00000000 --- a/server/ven/bin/pip +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from pip._internal.cli.main import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/pip3 b/server/ven/bin/pip3 deleted file mode 100755 index 9da46430..00000000 --- a/server/ven/bin/pip3 +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from pip._internal.cli.main import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/pip3.11 b/server/ven/bin/pip3.11 deleted file mode 100755 index 9da46430..00000000 --- a/server/ven/bin/pip3.11 +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from pip._internal.cli.main import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/server/ven/bin/py.test b/server/ven/bin/py.test deleted file mode 100755 index 1dbc57b3..00000000 --- a/server/ven/bin/py.test +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from pytest import console_main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(console_main()) diff --git a/server/ven/bin/pytest b/server/ven/bin/pytest deleted file mode 100755 index 1dbc57b3..00000000 --- a/server/ven/bin/pytest +++ /dev/null @@ -1,8 +0,0 @@ -#!/Users/medhani/Capstone/esp/server/ven/bin/python3.11 -# -*- coding: utf-8 -*- -import re -import sys -from pytest import console_main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(console_main()) diff --git a/server/ven/bin/python b/server/ven/bin/python deleted file mode 120000 index 6e7f3c7d..00000000 --- a/server/ven/bin/python +++ /dev/null @@ -1 +0,0 @@ -python3.11 \ No newline at end of file diff --git a/server/ven/bin/python3 b/server/ven/bin/python3 deleted file mode 120000 index 6e7f3c7d..00000000 --- a/server/ven/bin/python3 +++ /dev/null @@ -1 +0,0 @@ -python3.11 \ No newline at end of file diff --git a/server/ven/bin/python3.11 b/server/ven/bin/python3.11 deleted file mode 120000 index 2d175777..00000000 --- a/server/ven/bin/python3.11 +++ /dev/null @@ -1 +0,0 @@ -/Library/Frameworks/Python.framework/Versions/3.11/bin/python3.11 \ No newline at end of file diff --git a/server/ven/pyvenv.cfg b/server/ven/pyvenv.cfg deleted file mode 100644 index 773389b1..00000000 --- a/server/ven/pyvenv.cfg +++ /dev/null @@ -1,5 +0,0 @@ -home = /Library/Frameworks/Python.framework/Versions/3.11/bin -include-system-site-packages = false -version = 3.11.4 -executable = /Library/Frameworks/Python.framework/Versions/3.11/bin/python3.11 -command = /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m venv /Users/medhani/Capstone/esp/server/ven From c301d01a97b8238868ca5f3bf40645b87b9ddbaf Mon Sep 17 00:00:00 2001 From: SiriChandanaGarimella <156231102+SiriChandanaGarimella@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:01:17 -0500 Subject: [PATCH 5/7] Updated the upload_file API response --- server/usecases/upload_files.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/usecases/upload_files.py b/server/usecases/upload_files.py index 40861b51..65748d2f 100644 --- a/server/usecases/upload_files.py +++ b/server/usecases/upload_files.py @@ -12,8 +12,10 @@ def file_upload_use_case(file): return ResponseFailure(ResponseTypes.PARAMETER_ERROR, 'Invalid file type') try: - filename = save_uploaded_file(file) - return ResponseSuccess({'message': 'Success', 'filename': filename}) + file_path = save_uploaded_file(file) + file_name = file.filename + return ResponseSuccess({'message': 'Success', 'file_name': file_name, + 'file_path': file_path}) except PermissionError as e: return ResponseFailure(ResponseTypes.PARAMETER_ERROR, f'Permission denied: {str(e)}') except FileNotFoundError as e: From 5fb55c1e9f3288cef331af2d5514222d884d90c6 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Sun, 3 Nov 2024 21:07:07 -0600 Subject: [PATCH 6/7] completed the changes made in the review comments --- client-app/src/components/DraftOrcaDashboard.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/client-app/src/components/DraftOrcaDashboard.js b/client-app/src/components/DraftOrcaDashboard.js index 80128152..12d308c6 100644 --- a/client-app/src/components/DraftOrcaDashboard.js +++ b/client-app/src/components/DraftOrcaDashboard.js @@ -5,7 +5,7 @@ import "../styles/TempComponent.css"; const DraftOrcaDashboard = () => { const [selectedFile, setSelectedFile] = useState(null); - const [fileName, setFileName] = useState(""); + const [filePath, setFilePath] = useState(""); const [searchTerms, setSearchTerms] = useState([]); const [specifyLines, setSpecifyLines] = useState([]); const [sections, setSections] = useState([]); @@ -24,7 +24,6 @@ const DraftOrcaDashboard = () => { return; } setSelectedFile(selectedFile); - setFileName(selectedFile.name.split(/[/\\]/).pop()); }; const isSearchQueryEnabled = () => { @@ -76,8 +75,8 @@ const DraftOrcaDashboard = () => { axios .post("http://localhost:5001/upload", formData) .then((response) => { - const uploadedFileName = response.data.filename.split(/[/\\]/).pop(); - setFileName(response.data.filename); + const uploadedFileName = response.data.file_name.split(/[/\\]/).pop(); + setFilePath(response.data.file_path); setUploadedFiles((prevUploadedFiles) => [...prevUploadedFiles, uploadedFileName]); }) .catch((error) => { @@ -85,9 +84,9 @@ const DraftOrcaDashboard = () => { }); }; - const removeUploadedFile = (fileName) => { + const removeUploadedFile = (filePath) => { // You can add logic here to delete the file from the server if needed - setUploadedFiles((prevUploadedFiles) => prevUploadedFiles.filter((file) => file !== fileName)); + setUploadedFiles((prevUploadedFiles) => prevUploadedFiles.filter((file) => file !== filePath)); }; const onSubmit = () => { @@ -97,7 +96,7 @@ const DraftOrcaDashboard = () => { } const data = { - file_path: fileName.toString(), + file_path: filePath.toString(), search_terms: searchTerms, sections: sections, specify_lines: specifyLines.join(","), From 19919187fa0b953ee14f39bfa74c60028a62ba63 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:24:27 -0600 Subject: [PATCH 7/7] uploadedFileName changes --- client-app/src/components/DraftOrcaDashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/src/components/DraftOrcaDashboard.js b/client-app/src/components/DraftOrcaDashboard.js index 12d308c6..abd1a3ac 100644 --- a/client-app/src/components/DraftOrcaDashboard.js +++ b/client-app/src/components/DraftOrcaDashboard.js @@ -75,7 +75,7 @@ const DraftOrcaDashboard = () => { axios .post("http://localhost:5001/upload", formData) .then((response) => { - const uploadedFileName = response.data.file_name.split(/[/\\]/).pop(); + const uploadedFileName = response.data.file_name; setFilePath(response.data.file_path); setUploadedFiles((prevUploadedFiles) => [...prevUploadedFiles, uploadedFileName]); })