kanshan/ollama-python
1
0
Fork 0
mirror of https://github.com/ollama/ollama-python.git synced 2026-05-03 12:52:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IPv6 support (#262)

Browse Source 
* Support IPv6 host addresses

* Add missing tests

* Integrate feedback review to make it generally more stable and remove redundancies

* Remove unused import

* Fix formatting
This commit is contained in:
Johannes Binder
2024-08-28 01:51:14 +02:00
committed by GitHub
parent 981015cfb8
commit d98f646929
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ollama/_client.py
+30
View File
@@ -1,3 +1,4 @@
import ipaddress
import os import os
import io import io
import json import json
@@ -995,6 +996,28 @@ def _parse_host(host: Optional[str]) -> str:
'https://example.com:56789/path' 'https://example.com:56789/path'
>>> _parse_host('example.com:56789/path/') >>> _parse_host('example.com:56789/path/')
'http://example.com:56789/path' 'http://example.com:56789/path'
>>> _parse_host('[0001:002:003:0004::1]')
'http://[0001:002:003:0004::1]:11434'
>>> _parse_host('[0001:002:003:0004::1]:56789')
'http://[0001:002:003:0004::1]:56789'
>>> _parse_host('http://[0001:002:003:0004::1]')
'http://[0001:002:003:0004::1]:80'
>>> _parse_host('https://[0001:002:003:0004::1]')
'https://[0001:002:003:0004::1]:443'
>>> _parse_host('https://[0001:002:003:0004::1]:56789')
'https://[0001:002:003:0004::1]:56789'
>>> _parse_host('[0001:002:003:0004::1]/')
'http://[0001:002:003:0004::1]:11434'
>>> _parse_host('[0001:002:003:0004::1]:56789/')
'http://[0001:002:003:0004::1]:56789'
>>> _parse_host('[0001:002:003:0004::1]/path')
'http://[0001:002:003:0004::1]:11434/path'
>>> _parse_host('[0001:002:003:0004::1]:56789/path')
'http://[0001:002:003:0004::1]:56789/path'
>>> _parse_host('https://[0001:002:003:0004::1]:56789/path')
'https://[0001:002:003:0004::1]:56789/path'
>>> _parse_host('[0001:002:003:0004::1]:56789/path/')
'http://[0001:002:003:0004::1]:56789/path'
""" """
host, port = host or '', 11434 host, port = host or '', 11434
@@ -1010,6 +1033,13 @@ def _parse_host(host: Optional[str]) -> str:
host = split.hostname or '127.0.0.1' host = split.hostname or '127.0.0.1'
port = split.port or port port = split.port or port
# Fix missing square brackets for IPv6 from urlsplit
try:
if isinstance(ipaddress.ip_address(host), ipaddress.IPv6Address):
host = f'[{host}]'
except ValueError:
...
if path := split.path.strip('/'): if path := split.path.strip('/'):
return f'{scheme}://{host}:{port}/{path}' return f'{scheme}://{host}:{port}/{path}'