DSPy: The framework for programming—not prompting—language models
Python
adding the together fix
Somesh Fengade47d112ec3a71
diff --git a/dsp/modules/hf_client.py b/dsp/modules/hf_client.pyindex 56bbbb2ab..c850c46d8 100644--- a/dsp/modules/hf_client.py+++ b/dsp/modules/hf_client.py@@ -218,11 +218,11 @@ class HFServerTGI:docker_process.wait()class Together(HFModel):- def __init__(self, model, **kwargs):+ def __init__(self, model, api_key , **kwargs):super().__init__(model=model, is_client=True)self.session = requests.Session()- self.api_base = os.getenv("TOGETHER_API_BASE")- self.token = os.getenv("TOGETHER_API_KEY")+ self.api_base = "https://api.together.xyz/v1/"+ self.token = api_keyself.model = modelself.use_inst_template = False@@ -248,11 +248,9 @@ class Together(HFModel):max_time=1000,on_backoff=backoff_hdlr,)- def _generate(self, prompt, use_chat_api=False, **kwargs):+ def _generate(self, prompt, use_chat_api=True, **kwargs):url = f"{self.api_base}"-kwargs = {**self.kwargs, **kwargs}-stop = kwargs.get("stop")temperature = kwargs.get("temperature")max_tokens = kwargs.get("max_tokens", 150)@@ -272,10 +270,10 @@ class Together(HFModel):"messages": messages,"temperature": temperature,"max_tokens": max_tokens,- "top_p": top_p,- "top_k": top_k,- "repetition_penalty": repetition_penalty,- "stop": stop,+ # "top_p": top_p,+ # "top_k": top_k,+ # "repetition_penalty": repetition_penalty,+ # "stop": stop,}else:body = {@@ -283,26 +281,37 @@ class Together(HFModel):"prompt": prompt,"temperature": temperature,"max_tokens": max_tokens,- "top_p": top_p,- "top_k": top_k,- "repetition_penalty": repetition_penalty,- "stop": stop,+ # "top_p": top_p,+ # "top_k": top_k,+ # "repetition_penalty": repetition_penalty,+ # "stop": stop,}- headers = {"Authorization": f"Bearer {self.token}"}+ headers = {+ "Authorization": f"Bearer {self.token}",+ "Content-Type": "application/json"+ }++ try:+ # print(url, headers, body)+ # resp = requests.post(url, headers = headers , json = body)+ # print(resp.text)+ # return resp.json()- try:with self.session.post(url, headers=headers, json=body) as resp:+ print(resp)resp_json = resp.json()+ print(resp_json)if use_chat_api:- completions = [resp_json['output'].get('choices', [])[0].get('message', {}).get('content', "")]+ completions = [resp_json.get('choices', [])[0].get('message', {}).get('content', "")]else:- completions = [resp_json['output'].get('choices', [])[0].get('text', "")]+ completions = [resp_json.get('choices', [])[0].get('content', "")]response = {"prompt": prompt, "choices": [{"text": c} for c in completions]}return responseexcept Exception as e:- if resp_json:- print(f"resp_json:{resp_json}")+ pass+ # if resp_json:+ # print(f"resp_json:{resp_json}")print(f"Failed to parse JSON response: {e}")raise Exception("Received invalid JSON response from server")diff --git a/poetry.lock b/poetry.lockindex be2cbdc07..2eeb7de0c 100644--- a/poetry.lock+++ b/poetry.lock@@ -201,7 +201,7 @@ trio = ["trio (>=0.23)"]name = "appnope"version = "0.1.4"description = "Disable App Nap on macOS >= 10.9"-optional = true+optional = falsepython-versions = ">=3.6"files = [{file = "appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c"},@@ -212,7 +212,7 @@ files = [name = "asttokens"version = "2.4.1"description = "Annotate AST trees with source code positions"-optional = true+optional = falsepython-versions = "*"files = [{file = "asttokens-2.4.1-py2.py3-none-any.whl", hash = "sha256:051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24"},@@ -767,7 +767,7 @@ development = ["black", "flake8", "mypy", "pytest", "types-colorama"]name = "comm"version = "0.2.2"description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc."-optional = true+optional = falsepython-versions = ">=3.8"files = [{file = "comm-0.2.2-py3-none-any.whl", hash = "sha256:e6fb86cb70ff661ee8c9c14e7d36d6de3b4066f1441be4063df9c5009f0a64d3"},@@ -882,7 +882,7 @@ vision = ["Pillow (>=6.2.1)"]name = "debugpy"version = "1.8.1"description = "An implementation of the Debug Adapter Protocol for Python"-optional = true+optional = falsepython-versions = ">=3.8"files = [{file = "debugpy-1.8.1-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:3bda0f1e943d386cc7a0e71bfa59f4137909e2ed947fb3946c506e113000f741"},@@ -913,7 +913,7 @@ files = [name = "decorator"version = "5.1.1"description = "Decorators for Humans"-optional = true+optional = falsepython-versions = ">=3.5"files = [{file = "decorator-5.1.1-py3-none-any.whl", hash = "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"},@@ -1023,7 +1023,7 @@ test = ["pytest (>=6)"]name = "executing"version = "2.0.1"description = "Get the currently executing AST node of a frame, and other information"-optional = true+optional = falsepython-versions = ">=3.5"files = [{file = "executing-2.0.1-py2.py3-none-any.whl", hash = "sha256:eac49ca94516ccc753f9fb5ce82603156e590b27525a8bc32cce8ae302eb61bc"},@@ -1840,7 +1840,7 @@ files = [name = "ipykernel"version = "6.29.3"description = "IPython Kernel for Jupyter"-optional = true+optional = falsepython-versions = ">=3.8"files = [{file = "ipykernel-6.29.3-py3-none-any.whl", hash = "sha256:5aa086a4175b0229d4eca211e181fb473ea78ffd9869af36ba7694c947302a21"},@@ -1873,7 +1873,7 @@ test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0)", "pytest-asyncioname = "ipython"version = "8.18.1"description = "IPython: Productive Interactive Computing"-optional = true+optional = falsepython-versions = ">=3.9"files = [{file = "ipython-8.18.1-py3-none-any.whl", hash = "sha256:e8267419d72d81955ec1177f8a29aaa90ac80ad647499201119e2f05e99aa397"},@@ -1910,7 +1910,7 @@ test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.22)", "paname = "jedi"version = "0.19.1"description = "An autocompletion tool for Python that can be used for text editors."-optional = true+optional = falsepython-versions = ">=3.6"files = [{file = "jedi-0.19.1-py2.py3-none-any.whl", hash = "sha256:e983c654fe5c02867aef4cdfce5a2fbb4a50adc0af145f70504238f18ef5e7e0"},@@ -2019,7 +2019,7 @@ testing = ["coverage", "ipykernel", "jupytext", "matplotlib", "nbdime", "nbformaname = "jupyter-client"version = "8.6.1"description = "Jupyter protocol implementation and client libraries"-optional = true+optional = falsepython-versions = ">=3.8"files = [{file = "jupyter_client-8.6.1-py3-none-any.whl", hash = "sha256:3b7bd22f058434e3b9a7ea4b1500ed47de2713872288c0d511d19926f99b459f"},@@ -2042,7 +2042,7 @@ test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko", "pre-commit", "pytname = "jupyter-core"version = "5.7.2"description = "Jupyter core package. A base package on which Jupyter projects rely."-optional = true+optional = falsepython-versions = ">=3.8"files = [{file = "jupyter_core-5.7.2-py3-none-any.whl", hash = "sha256:4f7315d2f6b4bcf2e3e7cb6e46772eba760ae459cd1f59d29eb57b0a01bd7409"},@@ -2282,7 +2282,7 @@ urllib3 = "*"name = "matplotlib-inline"version = "0.1.6"description = "Inline Matplotlib backend for Jupyter"-optional = true+optional = falsepython-versions = ">=3.5"files = [{file = "matplotlib-inline-0.1.6.tar.gz", hash = "sha256:f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304"},@@ -2776,7 +2776,7 @@ test = ["pep440", "pre-commit", "pytest", "testpath"]name = "nest-asyncio"version = "1.6.0"description = "Patch asyncio to allow nested event loops"-optional = true+optional = falsepython-versions = ">=3.5"files = [{file = "nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c"},@@ -3344,7 +3344,7 @@ xml = ["lxml (>=4.9.2)"]name = "parso"version = "0.8.3"description = "A Python Parser"-optional = true+optional = falsepython-versions = ">=3.6"files = [{file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"},@@ -3370,7 +3370,7 @@ files = [name = "pexpect"version = "4.9.0"description = "Pexpect allows easy control of interactive console applications."-optional = true+optional = falsepython-versions = "*"files = [{file = "pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523"},@@ -3512,7 +3512,7 @@ virtualenv = ">=20.10.0"name = "prompt-toolkit"version = "3.0.43"description = "Library for building powerful interactive command lines in Python"-optional = true+optional = falsepython-versions = ">=3.7.0"files = [{file = "prompt_toolkit-3.0.43-py3-none-any.whl", hash = "sha256:a11a29cb3bf0a28a387fe5122cdb649816a957cd9261dcedf8c9f1fef33eacf6"},@@ -3546,7 +3546,7 @@ files = [name = "psutil"version = "5.9.8"description = "Cross-platform lib for process and system monitoring in Python."-optional = true+optional = falsepython-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"files = [{file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"},@@ -3596,7 +3596,7 @@ files = [name = "ptyprocess"version = "0.7.0"description = "Run a subprocess in a pseudo terminal"-optional = true+optional = falsepython-versions = "*"files = [{file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"},@@ -3654,7 +3654,7 @@ functions = ["apache-bookkeeper-client (>=4.16.1)", "grpcio (>=1.60.0)", "prometname = "pure-eval"version = "0.2.2"description = "Safely evaluate AST nodes without side effects"-optional = true+optional = falsepython-versions = "*"files = [{file = "pure_eval-0.2.2-py3-none-any.whl", hash = "sha256:01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350"},@@ -4051,7 +4051,7 @@ files = [name = "pywin32"version = "306"description = "Python for Window Extensions"-optional = true+optional = falsepython-versions = "*"files = [{file = "pywin32-306-cp310-cp310-win32.whl", hash = "sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d"},@@ -4148,7 +4148,7 @@ pyyaml = "*"name = "pyzmq"version = "25.1.2"description = "Python bindings for 0MQ"-optional = true+optional = falsepython-versions = ">=3.6"files = [{file = "pyzmq-25.1.2-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:e624c789359f1a16f83f35e2c705d07663ff2b4d4479bad35621178d8f0f6ea4"},@@ -5107,7 +5107,7 @@ sqlcipher = ["sqlcipher3_binary"]name = "stack-data"version = "0.6.3"description = "Extract data from python stack frames and tracebacks for informative displays"-optional = true+optional = falsepython-versions = "*"files = [{file = "stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"},@@ -5410,7 +5410,7 @@ optree = ["optree (>=0.9.1)"]name = "tornado"version = "6.4"description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."-optional = true+optional = falsepython-versions = ">= 3.8"files = [{file = "tornado-6.4-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:02ccefc7d8211e5a7f9e8bc3f9e5b0ad6262ba2fbb683a6443ecc804e5224ce0"},@@ -5450,7 +5450,7 @@ telegram = ["requests"]name = "traitlets"version = "5.14.2"description = "Traitlets Python configuration system"-optional = true+optional = falsepython-versions = ">=3.8"files = [{file = "traitlets-5.14.2-py3-none-any.whl", hash = "sha256:fcdf85684a772ddeba87db2f398ce00b40ff550d1528c03c14dbf6a02003cd80"},@@ -5933,7 +5933,7 @@ anyio = ">=3.0.0"name = "wcwidth"version = "0.2.13"description = "Measures the displayed width of unicode strings in a terminal"-optional = true+optional = falsepython-versions = "*"files = [{file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"},