Skip to content

Commit

Permalink
IPv6 support (#262)
Browse files Browse the repository at this point in the history
* Support IPv6 host addresses

* Add missing tests

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

* Remove unused import

* Fix formatting
  • Loading branch information
jbinder authored Aug 27, 2024
1 parent 981015c commit d98f646
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions ollama/_client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ipaddress
import os
import io
import json
Expand Down Expand Up @@ -995,6 +996,28 @@ def _parse_host(host: Optional[str]) -> str:
'https://example.com:56789/path'
>>> _parse_host('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
Expand All @@ -1010,6 +1033,13 @@ def _parse_host(host: Optional[str]) -> str:
host = split.hostname or '127.0.0.1'
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('/'):
return f'{scheme}://{host}:{port}/{path}'

Expand Down

0 comments on commit d98f646

Please sign in to comment.