diff --git a/.vscode/settings.json b/.vscode/settings.json index 148d41c..27c231c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,11 @@ { "editor.formatOnSave": true, - "python.formatting.provider": "black", + "python.formatting.provider": "none", "python.formatting.blackArgs": ["--line-length", "120"], "python.linting.pylintUseMinimalCheckers": false, - "editor.showUnused": true + "editor.showUnused": true, + "python.analysis.typeCheckingMode": "basic", + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter" + } } diff --git a/README.md b/README.md index eea6d9f..46f7a68 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ Setup a Haiku hotline with Twilio that can be called like any other phone number from gevent import monkey monkey.patch_all() - from llm_convo.agents import OpenAIChat, TwilioCaller from llm_convo.twilio_io import TwilioServer from llm_convo.conversation import run_conversation @@ -70,3 +69,50 @@ tws.on_session = run_chat # You can also have ChatGPT actually start the call, e.g. for automated ordering # tws.start_call("+18321231234") ``` + +# solv notes + +- need to `brew install portaudio` +- install ngrok (brew) +- run ngrok and configure twilio with ngrok url +- pip install gevent python-dotenv twilio flask flask-sock +- lots of typos (need llm\_ in front of some things) + +# instructions for setting up twilio webhook + ngrok + +To point your Twilio Voice webhook to an ngrok URL, follow these steps: + +1. Install and set up ngrok on your local machine. Ngrok provides a secure tunnel to expose your local development server to the internet. You can download ngrok from the official website: https://ngrok.com/download. + +2. Start ngrok by running the following command in your terminal: + +``` +ngrok http 8000 +``` + +Replace 8000 with the port number where your local development server is running. Ensure that your local server is running before starting ngrok. + +3. Once ngrok is running, it will display a Forwarding URL. It should look something like this: + +``` +Forwarding https://abcdef.ngrok.io -> http://localhost:8000 +``` + +Note the HTTPS URL provided by ngrok (https://abcdef.ngrok.io in this example). + +4. Go to the Twilio Console (https://www.twilio.com/console) and navigate to the phone number you want to configure. + +5. In the Phone Number settings, locate the Voice section and find the "A CALL COMES IN" field. Enter the ngrok URL followed by the path to your voice webhook endpoint. For example: + +``` + +https://abcdef.ngrok.io/audio/incoming-voice +``` + +Replace https://abcdef.ngrok.io with your ngrok URL and /audio/incoming-voice with the path to your voice webhook endpoint. + +6. Save the changes to apply the new webhook URL. + +Now, when a voice call comes to your Twilio phone number, Twilio will forward the call to the ngrok URL, which will then redirect it to your local development server running on the specified port. + +Remember that ngrok generates a temporary URL for each session, and it may change every time you restart ngrok. Make sure to update the webhook URL in the Twilio Console accordingly whenever you restart ngrok. diff --git a/demo.py b/demo.py new file mode 100644 index 0000000..9ce7c54 --- /dev/null +++ b/demo.py @@ -0,0 +1,61 @@ +from gevent import monkey +from dotenv import load_dotenv +import os + +load_dotenv() + +monkey.patch_all() + + +# HERE +from llm_convo.agents import OpenAIChat, TwilioCaller +from llm_convo.twilio_io import TwilioServer +from llm_convo.conversation import run_conversation +import logging +import time + + +print("WERE DOING SOMETHING") + +logging.getLogger().setLevel(logging.INFO) + +tws = TwilioServer( + remote_host="a8db-2603-8000-d100-14c9-810f-3c78-5c9a-603.ngrok.io", + port=8080, + static_dir=r"/static", +) +# Point twilio voice webhook to https://abcdef.ngrok.app/audio/incoming-voice +tws.start() + +# agent_a = OpenAIChat( +# system_prompt="You are a Haiku Assistant. Answer whatever the user wants but always in a rhyming Haiku.", +# init_phrase="This is Haiku Bot, how can I help you.", +# ) +agent_a = OpenAIChat( + system_prompt=""" +You are an ordering bot that is going to call a pizza place an order a pizza. +When you need to say numbers space them out (e.g. 1 2 3) and do not respond with abbreviations. +If they ask for information not known, make something up that's reasonable. + +The customer's details are: +* Address: 1234 Candyland Road, Apt 506 +* Credit Card: 1234 5555 8888 9999 (CVV: 010) +* Name: Bob Joe +* Order: 1 large pizza with only pepperoni +""", + init_phrase="Hi, I would like to order a pizza.", +) + + +def run_chat(sess): + print("running chat", sess) + agent_b = TwilioCaller(sess) + while not agent_b.session.media_stream_connected(): + time.sleep(0.1) + run_conversation(agent_a, agent_b) + + +tws.on_session = run_chat + +# You can also have ChatGPT actually start the call, e.g. for automated ordering +tws.start_call("+15035761174") diff --git a/llm_convo/agents.py b/llm_convo/agents.py index 143d863..e1fada4 100644 --- a/llm_convo/agents.py +++ b/llm_convo/agents.py @@ -1,10 +1,10 @@ from typing import List, Optional from abc import ABC, abstractmethod -from convo.audio_input import WhisperMicrophone -from convo.audio_output import TTSClient, GoogleTTS -from convo.openai_io import OpenAIChatCompletion -from convo.twilio_io import TwilioCallSession +from llm_convo.audio_input import WhisperMicrophone +from llm_convo.audio_output import TTSClient, GoogleTTS +from llm_convo.openai_io import OpenAIChatCompletion +from llm_convo.twilio_io import TwilioCallSession class ChatAgent(ABC): @@ -48,7 +48,12 @@ def get_response(self, transcript: List[str]) -> str: class TwilioCaller(ChatAgent): - def __init__(self, session: TwilioCallSession, tts: Optional[TTSClient] = None, thinking_phrase: str = "OK"): + def __init__( + self, + session: TwilioCallSession, + tts: Optional[TTSClient] = None, + thinking_phrase: str = "OK", + ): self.session = session self.speaker = tts or GoogleTTS() self.thinking_phrase = thinking_phrase diff --git a/llm_convo/conversation.py b/llm_convo/conversation.py index 92d15b2..32e5397 100644 --- a/llm_convo/conversation.py +++ b/llm_convo/conversation.py @@ -1,4 +1,4 @@ -from convo.agents import ChatAgent +from llm_convo.agents import ChatAgent def run_conversation(agent_a: ChatAgent, agent_b: ChatAgent): diff --git a/llm_convo/twilio_io.py b/llm_convo/twilio_io.py index c9d19a2..6f5a437 100644 --- a/llm_convo/twilio_io.py +++ b/llm_convo/twilio_io.py @@ -12,7 +12,7 @@ import simple_websocket import audioop -from convo.audio_input import WhisperTwilioStream +from llm_convo.audio_input import WhisperTwilioStream XML_MEDIA_STREAM = """ @@ -36,21 +36,38 @@ def __init__(self, remote_host: str, port: int, static_dir: str): self.on_session = None account_sid = os.environ["TWILIO_ACCOUNT_SID"] - auth_token = os.environ["TWILIO_AUTH_TOKEN"] + # auth_token = os.environ["TWILIO_AUTH_TOKEN"] self.from_phone = os.environ["TWILIO_PHONE_NUMBER"] - self.client = Client(account_sid, auth_token) + # self.client = Client(account_sid, auth_token) + api_key = os.environ["TWILIO_API_KEY"] # might just be SID + api_secret = os.environ["TWILIO_API_SECRET"] # dami gave + account_sid = os.environ["TWILIO_ACCOUNT_SID"] # test from twilio + print("api_key: ", api_key) + print("api_secret: ", api_secret) + print("account_sid: ", account_sid) + self.client = Client(api_key, api_secret, account_sid) @self.app.route("/audio/") def audio(key): return send_from_directory(self.static_dir, str(int(key)) + ".mp3") + @self.app.route("/test") + def test(): + return "hello world" + @self.app.route("/incoming-voice", methods=["POST"]) def incoming_voice(): + logging.info("Incoming call") return XML_MEDIA_STREAM.format(host=self.remote_host) @self.sock.route("/audiostream", websocket=True) def on_media_stream(ws): - session = TwilioCallSession(ws, self.client, remote_host=self.remote_host, static_dir=self.static_dir) + session = TwilioCallSession( + ws, + self.client, + remote_host=self.remote_host, + static_dir=self.static_dir, + ) if self.on_session is not None: thread = threading.Thread(target=self.on_session, args=(session,)) thread.start() diff --git a/myenv/bin/Activate.ps1 b/myenv/bin/Activate.ps1 new file mode 100644 index 0000000..b49d77b --- /dev/null +++ b/myenv/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/myenv/bin/activate b/myenv/bin/activate new file mode 100755 index 0000000..8a3bfdf --- /dev/null +++ b/myenv/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/mitch/SOLV/llm_convo/myenv" +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="(myenv) ${PS1:-}" + export PS1 + VIRTUAL_ENV_PROMPT="(myenv) " + 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/myenv/bin/activate.csh b/myenv/bin/activate.csh new file mode 100644 index 0000000..f81cacd --- /dev/null +++ b/myenv/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/mitch/SOLV/llm_convo/myenv" + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/bin:$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + set prompt = "(myenv) $prompt" + setenv VIRTUAL_ENV_PROMPT "(myenv) " +endif + +alias pydoc python -m pydoc + +rehash diff --git a/myenv/bin/activate.fish b/myenv/bin/activate.fish new file mode 100644 index 0000000..fa2a752 --- /dev/null +++ b/myenv/bin/activate.fish @@ -0,0 +1,66 @@ +# 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" + functions -e fish_prompt + set -e _OLD_FISH_PROMPT_OVERRIDE + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt + 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/mitch/SOLV/llm_convo/myenv" + +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) "(myenv) " (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 "(myenv) " +end diff --git a/myenv/bin/pip b/myenv/bin/pip new file mode 100755 index 0000000..ac66355 --- /dev/null +++ b/myenv/bin/pip @@ -0,0 +1,8 @@ +#!/Users/mitch/SOLV/llm_convo/myenv/bin/python +# -*- 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/myenv/bin/pip3 b/myenv/bin/pip3 new file mode 100755 index 0000000..ac66355 --- /dev/null +++ b/myenv/bin/pip3 @@ -0,0 +1,8 @@ +#!/Users/mitch/SOLV/llm_convo/myenv/bin/python +# -*- 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/myenv/bin/pip3.10 b/myenv/bin/pip3.10 new file mode 100755 index 0000000..ac66355 --- /dev/null +++ b/myenv/bin/pip3.10 @@ -0,0 +1,8 @@ +#!/Users/mitch/SOLV/llm_convo/myenv/bin/python +# -*- 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/myenv/bin/python b/myenv/bin/python new file mode 120000 index 0000000..afb2296 --- /dev/null +++ b/myenv/bin/python @@ -0,0 +1 @@ +/Users/mitch/.pyenv/versions/3.10.4/bin/python \ No newline at end of file diff --git a/myenv/bin/python3 b/myenv/bin/python3 new file mode 120000 index 0000000..d8654aa --- /dev/null +++ b/myenv/bin/python3 @@ -0,0 +1 @@ +python \ No newline at end of file diff --git a/myenv/bin/python3.10 b/myenv/bin/python3.10 new file mode 120000 index 0000000..d8654aa --- /dev/null +++ b/myenv/bin/python3.10 @@ -0,0 +1 @@ +python \ No newline at end of file diff --git a/myenv/pyvenv.cfg b/myenv/pyvenv.cfg new file mode 100644 index 0000000..10c5c2c --- /dev/null +++ b/myenv/pyvenv.cfg @@ -0,0 +1,3 @@ +home = /Users/mitch/.pyenv/versions/3.10.4/bin +include-system-site-packages = false +version = 3.10.4 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755