From 4693901cf2992f0ea7a19caa1bad89229dc67e72 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 22 Jul 2025 17:16:45 +0000 Subject: [PATCH 1/5] Initial plan From cf93b56e9192ad9da25e61ae544ca7e3c202d18e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 22 Jul 2025 17:33:18 +0000 Subject: [PATCH 2/5] Fix OpenTelemetry package dependency conflicts by upgrading all packages to 0.56b0 Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- src/backend/requirements.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt index a56db9d..aedefdf 100644 --- a/src/backend/requirements.txt +++ b/src/backend/requirements.txt @@ -162,7 +162,7 @@ opentelemetry-api==1.31.1 # opentelemetry-instrumentation-wsgi # opentelemetry-sdk # opentelemetry-semantic-conventions -opentelemetry-instrumentation==0.52b1 +opentelemetry-instrumentation==0.56b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi @@ -177,31 +177,31 @@ opentelemetry-instrumentation==0.52b1 # opentelemetry-instrumentation-urllib # opentelemetry-instrumentation-urllib3 # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-aiohttp-client==0.52b1 +opentelemetry-instrumentation-aiohttp-client==0.56b0 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-asgi==0.52b1 +opentelemetry-instrumentation-asgi==0.56b0 # via opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-dbapi==0.52b1 +opentelemetry-instrumentation-dbapi==0.56b0 # via opentelemetry-instrumentation-psycopg2 -opentelemetry-instrumentation-django==0.52b1 +opentelemetry-instrumentation-django==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-fastapi==0.52b1 +opentelemetry-instrumentation-fastapi==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-flask==0.52b1 +opentelemetry-instrumentation-flask==0.56b0 # via azure-monitor-opentelemetry opentelemetry-instrumentation-openai==0.41.0 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-psycopg2==0.52b1 +opentelemetry-instrumentation-psycopg2==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-requests==0.52b1 +opentelemetry-instrumentation-requests==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-sqlalchemy==0.52b1 +opentelemetry-instrumentation-sqlalchemy==0.56b0 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-urllib==0.52b1 +opentelemetry-instrumentation-urllib==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-urllib3==0.52b1 +opentelemetry-instrumentation-urllib3==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-wsgi==0.52b1 +opentelemetry-instrumentation-wsgi==0.56b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-flask @@ -212,7 +212,7 @@ opentelemetry-sdk==1.31.1 # azure-monitor-opentelemetry # azure-monitor-opentelemetry-exporter # opentelemetry-resource-detector-azure -opentelemetry-semantic-conventions==0.52b1 +opentelemetry-semantic-conventions==0.56b0 # via # opentelemetry-instrumentation # opentelemetry-instrumentation-aiohttp-client @@ -230,7 +230,7 @@ opentelemetry-semantic-conventions==0.52b1 # opentelemetry-sdk opentelemetry-semantic-conventions-ai==0.4.10 # via opentelemetry-instrumentation-openai -opentelemetry-util-http==0.52b1 +opentelemetry-util-http==0.56b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi From 118999b44a4c0ca7522ad117475f074cc301748e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 22 Jul 2025 20:12:09 +0000 Subject: [PATCH 3/5] Fix dependency conflicts by reverting OpenTelemetry packages to 0.52b1 and upgrading azure-monitor-opentelemetry to 1.6.12 Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- src/backend/requirements.txt | 32 ++-- test_venv_fixed/bin/Activate.ps1 | 247 ++++++++++++++++++++++++++++++ test_venv_fixed/bin/activate | 70 +++++++++ test_venv_fixed/bin/activate.csh | 27 ++++ test_venv_fixed/bin/activate.fish | 69 +++++++++ test_venv_fixed/bin/pip | 8 + test_venv_fixed/bin/pip3 | 8 + test_venv_fixed/bin/pip3.12 | 8 + test_venv_fixed/bin/python | 1 + test_venv_fixed/bin/python3 | 1 + test_venv_fixed/bin/python3.12 | 1 + test_venv_fixed/lib64 | 1 + test_venv_fixed/pyvenv.cfg | 5 + 13 files changed, 462 insertions(+), 16 deletions(-) create mode 100644 test_venv_fixed/bin/Activate.ps1 create mode 100644 test_venv_fixed/bin/activate create mode 100644 test_venv_fixed/bin/activate.csh create mode 100644 test_venv_fixed/bin/activate.fish create mode 100755 test_venv_fixed/bin/pip create mode 100755 test_venv_fixed/bin/pip3 create mode 100755 test_venv_fixed/bin/pip3.12 create mode 120000 test_venv_fixed/bin/python create mode 120000 test_venv_fixed/bin/python3 create mode 120000 test_venv_fixed/bin/python3.12 create mode 120000 test_venv_fixed/lib64 create mode 100644 test_venv_fixed/pyvenv.cfg diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt index aedefdf..1466ad8 100644 --- a/src/backend/requirements.txt +++ b/src/backend/requirements.txt @@ -41,7 +41,7 @@ azure-identity==1.23.1 # via # fastapi-app (pyproject.toml) # azure-monitor-opentelemetry-exporter -azure-monitor-opentelemetry==1.6.10 +azure-monitor-opentelemetry==1.6.12 # via fastapi-app (pyproject.toml) azure-monitor-opentelemetry-exporter==1.0.0b39 # via azure-monitor-opentelemetry @@ -162,7 +162,7 @@ opentelemetry-api==1.31.1 # opentelemetry-instrumentation-wsgi # opentelemetry-sdk # opentelemetry-semantic-conventions -opentelemetry-instrumentation==0.56b0 +opentelemetry-instrumentation==0.52b1 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi @@ -177,31 +177,31 @@ opentelemetry-instrumentation==0.56b0 # opentelemetry-instrumentation-urllib # opentelemetry-instrumentation-urllib3 # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-aiohttp-client==0.56b0 +opentelemetry-instrumentation-aiohttp-client==0.52b1 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-asgi==0.56b0 +opentelemetry-instrumentation-asgi==0.52b1 # via opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-dbapi==0.56b0 +opentelemetry-instrumentation-dbapi==0.52b1 # via opentelemetry-instrumentation-psycopg2 -opentelemetry-instrumentation-django==0.56b0 +opentelemetry-instrumentation-django==0.52b1 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-fastapi==0.56b0 +opentelemetry-instrumentation-fastapi==0.52b1 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-flask==0.56b0 +opentelemetry-instrumentation-flask==0.52b1 # via azure-monitor-opentelemetry opentelemetry-instrumentation-openai==0.41.0 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-psycopg2==0.56b0 +opentelemetry-instrumentation-psycopg2==0.52b1 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-requests==0.56b0 +opentelemetry-instrumentation-requests==0.52b1 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-sqlalchemy==0.56b0 +opentelemetry-instrumentation-sqlalchemy==0.52b1 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-urllib==0.56b0 +opentelemetry-instrumentation-urllib==0.52b1 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-urllib3==0.56b0 +opentelemetry-instrumentation-urllib3==0.52b1 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-wsgi==0.56b0 +opentelemetry-instrumentation-wsgi==0.52b1 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-flask @@ -212,7 +212,7 @@ opentelemetry-sdk==1.31.1 # azure-monitor-opentelemetry # azure-monitor-opentelemetry-exporter # opentelemetry-resource-detector-azure -opentelemetry-semantic-conventions==0.56b0 +opentelemetry-semantic-conventions==0.52b1 # via # opentelemetry-instrumentation # opentelemetry-instrumentation-aiohttp-client @@ -230,7 +230,7 @@ opentelemetry-semantic-conventions==0.56b0 # opentelemetry-sdk opentelemetry-semantic-conventions-ai==0.4.10 # via opentelemetry-instrumentation-openai -opentelemetry-util-http==0.56b0 +opentelemetry-util-http==0.52b1 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi diff --git a/test_venv_fixed/bin/Activate.ps1 b/test_venv_fixed/bin/Activate.ps1 new file mode 100644 index 0000000..b49d77b --- /dev/null +++ b/test_venv_fixed/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/test_venv_fixed/bin/activate b/test_venv_fixed/bin/activate new file mode 100644 index 0000000..88970fd --- /dev/null +++ b/test_venv_fixed/bin/activate @@ -0,0 +1,70 @@ +# 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 + + # Call hash to forget past commands. Without forgetting + # past commands the $PATH changes we made may not be respected + hash -r 2> /dev/null + + 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 + +# on Windows, a path can contain colons and backslashes and has to be converted: +if [ "${OSTYPE:-}" = "cygwin" ] || [ "${OSTYPE:-}" = "msys" ] ; then + # transform D:\path\to\venv to /d/path/to/venv on MSYS + # and to /cygdrive/d/path/to/venv on Cygwin + export VIRTUAL_ENV=$(cygpath /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed) +else + # use the path as-is + export VIRTUAL_ENV=/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed +fi + +_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='(test_venv_fixed) '"${PS1:-}" + export PS1 + VIRTUAL_ENV_PROMPT='(test_venv_fixed) ' + export VIRTUAL_ENV_PROMPT +fi + +# Call hash to forget past commands. Without forgetting +# past commands the $PATH changes we made may not be respected +hash -r 2> /dev/null diff --git a/test_venv_fixed/bin/activate.csh b/test_venv_fixed/bin/activate.csh new file mode 100644 index 0000000..f500ce5 --- /dev/null +++ b/test_venv_fixed/bin/activate.csh @@ -0,0 +1,27 @@ +# 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 /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/"bin":$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + set prompt = '(test_venv_fixed) '"$prompt" + setenv VIRTUAL_ENV_PROMPT '(test_venv_fixed) ' +endif + +alias pydoc python -m pydoc + +rehash diff --git a/test_venv_fixed/bin/activate.fish b/test_venv_fixed/bin/activate.fish new file mode 100644 index 0000000..3abcb62 --- /dev/null +++ b/test_venv_fixed/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 /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed + +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) '(test_venv_fixed) ' (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 '(test_venv_fixed) ' +end diff --git a/test_venv_fixed/bin/pip b/test_venv_fixed/bin/pip new file mode 100755 index 0000000..9926f7c --- /dev/null +++ b/test_venv_fixed/bin/pip @@ -0,0 +1,8 @@ +#!/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed/bin/python3 +# -*- 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/test_venv_fixed/bin/pip3 b/test_venv_fixed/bin/pip3 new file mode 100755 index 0000000..9926f7c --- /dev/null +++ b/test_venv_fixed/bin/pip3 @@ -0,0 +1,8 @@ +#!/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed/bin/python3 +# -*- 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/test_venv_fixed/bin/pip3.12 b/test_venv_fixed/bin/pip3.12 new file mode 100755 index 0000000..9926f7c --- /dev/null +++ b/test_venv_fixed/bin/pip3.12 @@ -0,0 +1,8 @@ +#!/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed/bin/python3 +# -*- 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/test_venv_fixed/bin/python b/test_venv_fixed/bin/python new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/test_venv_fixed/bin/python @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/test_venv_fixed/bin/python3 b/test_venv_fixed/bin/python3 new file mode 120000 index 0000000..ae65fda --- /dev/null +++ b/test_venv_fixed/bin/python3 @@ -0,0 +1 @@ +/usr/bin/python3 \ No newline at end of file diff --git a/test_venv_fixed/bin/python3.12 b/test_venv_fixed/bin/python3.12 new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/test_venv_fixed/bin/python3.12 @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/test_venv_fixed/lib64 b/test_venv_fixed/lib64 new file mode 120000 index 0000000..7951405 --- /dev/null +++ b/test_venv_fixed/lib64 @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/test_venv_fixed/pyvenv.cfg b/test_venv_fixed/pyvenv.cfg new file mode 100644 index 0000000..ded715f --- /dev/null +++ b/test_venv_fixed/pyvenv.cfg @@ -0,0 +1,5 @@ +home = /usr/bin +include-system-site-packages = false +version = 3.12.3 +executable = /usr/bin/python3.12 +command = /usr/bin/python3 -m venv /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed From ce5acd2925d8c7b38a7ed2b90d0dba6e9b0e8e22 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 22 Jul 2025 20:12:43 +0000 Subject: [PATCH 4/5] Remove accidentally committed test virtual environment and update .gitignore Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- .gitignore | 3 + test_venv_fixed/bin/Activate.ps1 | 247 ------------------------------ test_venv_fixed/bin/activate | 70 --------- test_venv_fixed/bin/activate.csh | 27 ---- test_venv_fixed/bin/activate.fish | 69 --------- test_venv_fixed/bin/pip | 8 - test_venv_fixed/bin/pip3 | 8 - test_venv_fixed/bin/pip3.12 | 8 - test_venv_fixed/bin/python | 1 - test_venv_fixed/bin/python3 | 1 - test_venv_fixed/bin/python3.12 | 1 - test_venv_fixed/lib64 | 1 - test_venv_fixed/pyvenv.cfg | 5 - 13 files changed, 3 insertions(+), 446 deletions(-) delete mode 100644 test_venv_fixed/bin/Activate.ps1 delete mode 100644 test_venv_fixed/bin/activate delete mode 100644 test_venv_fixed/bin/activate.csh delete mode 100644 test_venv_fixed/bin/activate.fish delete mode 100755 test_venv_fixed/bin/pip delete mode 100755 test_venv_fixed/bin/pip3 delete mode 100755 test_venv_fixed/bin/pip3.12 delete mode 120000 test_venv_fixed/bin/python delete mode 120000 test_venv_fixed/bin/python3 delete mode 120000 test_venv_fixed/bin/python3.12 delete mode 120000 test_venv_fixed/lib64 delete mode 100644 test_venv_fixed/pyvenv.cfg diff --git a/.gitignore b/.gitignore index 0381fcc..01d8adf 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,6 @@ static/ # Playwright test trace test-results/ + +# Test virtual environments +test_venv*/ diff --git a/test_venv_fixed/bin/Activate.ps1 b/test_venv_fixed/bin/Activate.ps1 deleted file mode 100644 index b49d77b..0000000 --- a/test_venv_fixed/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/test_venv_fixed/bin/activate b/test_venv_fixed/bin/activate deleted file mode 100644 index 88970fd..0000000 --- a/test_venv_fixed/bin/activate +++ /dev/null @@ -1,70 +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 - - # Call hash to forget past commands. Without forgetting - # past commands the $PATH changes we made may not be respected - hash -r 2> /dev/null - - 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 - -# on Windows, a path can contain colons and backslashes and has to be converted: -if [ "${OSTYPE:-}" = "cygwin" ] || [ "${OSTYPE:-}" = "msys" ] ; then - # transform D:\path\to\venv to /d/path/to/venv on MSYS - # and to /cygdrive/d/path/to/venv on Cygwin - export VIRTUAL_ENV=$(cygpath /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed) -else - # use the path as-is - export VIRTUAL_ENV=/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed -fi - -_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='(test_venv_fixed) '"${PS1:-}" - export PS1 - VIRTUAL_ENV_PROMPT='(test_venv_fixed) ' - export VIRTUAL_ENV_PROMPT -fi - -# Call hash to forget past commands. Without forgetting -# past commands the $PATH changes we made may not be respected -hash -r 2> /dev/null diff --git a/test_venv_fixed/bin/activate.csh b/test_venv_fixed/bin/activate.csh deleted file mode 100644 index f500ce5..0000000 --- a/test_venv_fixed/bin/activate.csh +++ /dev/null @@ -1,27 +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 /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed - -set _OLD_VIRTUAL_PATH="$PATH" -setenv PATH "$VIRTUAL_ENV/"bin":$PATH" - - -set _OLD_VIRTUAL_PROMPT="$prompt" - -if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then - set prompt = '(test_venv_fixed) '"$prompt" - setenv VIRTUAL_ENV_PROMPT '(test_venv_fixed) ' -endif - -alias pydoc python -m pydoc - -rehash diff --git a/test_venv_fixed/bin/activate.fish b/test_venv_fixed/bin/activate.fish deleted file mode 100644 index 3abcb62..0000000 --- a/test_venv_fixed/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 /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed - -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) '(test_venv_fixed) ' (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 '(test_venv_fixed) ' -end diff --git a/test_venv_fixed/bin/pip b/test_venv_fixed/bin/pip deleted file mode 100755 index 9926f7c..0000000 --- a/test_venv_fixed/bin/pip +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed/bin/python3 -# -*- 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/test_venv_fixed/bin/pip3 b/test_venv_fixed/bin/pip3 deleted file mode 100755 index 9926f7c..0000000 --- a/test_venv_fixed/bin/pip3 +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed/bin/python3 -# -*- 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/test_venv_fixed/bin/pip3.12 b/test_venv_fixed/bin/pip3.12 deleted file mode 100755 index 9926f7c..0000000 --- a/test_venv_fixed/bin/pip3.12 +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed/bin/python3 -# -*- 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/test_venv_fixed/bin/python b/test_venv_fixed/bin/python deleted file mode 120000 index b8a0adb..0000000 --- a/test_venv_fixed/bin/python +++ /dev/null @@ -1 +0,0 @@ -python3 \ No newline at end of file diff --git a/test_venv_fixed/bin/python3 b/test_venv_fixed/bin/python3 deleted file mode 120000 index ae65fda..0000000 --- a/test_venv_fixed/bin/python3 +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/python3 \ No newline at end of file diff --git a/test_venv_fixed/bin/python3.12 b/test_venv_fixed/bin/python3.12 deleted file mode 120000 index b8a0adb..0000000 --- a/test_venv_fixed/bin/python3.12 +++ /dev/null @@ -1 +0,0 @@ -python3 \ No newline at end of file diff --git a/test_venv_fixed/lib64 b/test_venv_fixed/lib64 deleted file mode 120000 index 7951405..0000000 --- a/test_venv_fixed/lib64 +++ /dev/null @@ -1 +0,0 @@ -lib \ No newline at end of file diff --git a/test_venv_fixed/pyvenv.cfg b/test_venv_fixed/pyvenv.cfg deleted file mode 100644 index ded715f..0000000 --- a/test_venv_fixed/pyvenv.cfg +++ /dev/null @@ -1,5 +0,0 @@ -home = /usr/bin -include-system-site-packages = false -version = 3.12.3 -executable = /usr/bin/python3.12 -command = /usr/bin/python3 -m venv /home/runner/work/rag-postgres-openai-python/rag-postgres-openai-python/test_venv_fixed From ee8630d75efcc803151e80aeee9cce6e72428960 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 23 Jul 2025 00:22:26 +0000 Subject: [PATCH 5/5] Fix dependency conflict by upgrading azure-monitor-opentelemetry-exporter to 1.0.0b40 Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- src/backend/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt index 1466ad8..b83031b 100644 --- a/src/backend/requirements.txt +++ b/src/backend/requirements.txt @@ -43,7 +43,7 @@ azure-identity==1.23.1 # azure-monitor-opentelemetry-exporter azure-monitor-opentelemetry==1.6.12 # via fastapi-app (pyproject.toml) -azure-monitor-opentelemetry-exporter==1.0.0b39 +azure-monitor-opentelemetry-exporter==1.0.0b40 # via azure-monitor-opentelemetry backports-datetime-fromisoformat==2.0.3 # via marshmallow pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy