Skip to content

Fix accidental adding of / to all AnyHttpUrl models in grpc gen.conf. #1628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dirkkul merged 3 commits into from
Apr 10, 2025
Merged

Fix accidental adding of / to all AnyHttpUrl models in grpc gen.conf. #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fd9701
Fix accidental adding of `/` to all `AnyHttpUrl` models in grpc gen.c…
tsmith023 Apr 10, 2025
582fd85
Use `.strip()` instead
tsmith023 Apr 10, 2025
0bb3c32
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions test/collection/test_classes_generative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
anthropic=GenerativeAnthropic(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
model="text-to-image",
max_tokens=100,
stop_sequences=TextArray(values=["\n"]),
Expand All @@ -107,7 +107,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
anyscale=GenerativeAnyscale(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
model="text-to-image",
temperature=0.5,
),
Expand All @@ -130,7 +130,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
aws=GenerativeAWS(
endpoint="http://localhost:8080/",
endpoint="http://localhost:8080",
model="text-to-image",
region="us-west-2",
service="sagemaker",
Expand All @@ -156,7 +156,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
cohere=GenerativeCohere(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
k=5,
max_tokens=100,
model="text-to-image",
Expand Down Expand Up @@ -184,7 +184,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
databricks=GenerativeDatabricks(
endpoint="http://localhost:8080/",
endpoint="http://localhost:8080",
frequency_penalty=0.5,
log_probs=True,
max_tokens=100,
Expand Down Expand Up @@ -216,7 +216,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
friendliai=GenerativeFriendliAI(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
max_tokens=100,
model="text-to-image",
n=5,
Expand Down Expand Up @@ -247,7 +247,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
google=GenerativeGoogle(
api_endpoint="localhost:8080/",
api_endpoint="localhost:8080",
endpoint_id="12345678901234567890123456789012",
frequency_penalty=0.5,
max_tokens=100,
Expand Down Expand Up @@ -275,7 +275,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
mistral=GenerativeMistral(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
max_tokens=100,
model="text-to-image",
temperature=0.5,
Expand All @@ -294,7 +294,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
nvidia=GenerativeNvidia(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
max_tokens=100,
model="text-to-image",
temperature=0.5,
Expand All @@ -315,7 +315,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
ollama=GenerativeOllama(
api_endpoint="http://localhost:8080/",
api_endpoint="http://localhost:8080",
model="text-to-image",
temperature=0.5,
images=TextArray(values=[LOGO_ENCODED]),
Expand Down Expand Up @@ -345,7 +345,7 @@ def test_generative_parameters_images_parsing(
return_metadata=True,
openai=GenerativeOpenAI(
api_version="2020-05-03",
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
deployment_id="12345678901234567890123456789012",
frequency_penalty=0.5,
max_tokens=100,
Expand Down Expand Up @@ -383,7 +383,7 @@ def test_generative_parameters_images_parsing(
return_metadata=True,
openai=GenerativeOpenAI(
api_version="2020-05-03",
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
deployment_id="12345678901234567890123456789012",
frequency_penalty=0.5,
max_tokens=100,
Expand Down Expand Up @@ -414,7 +414,7 @@ def test_generative_parameters_images_parsing(
GenerativeProvider(
return_metadata=True,
xai=GenerativeXAI(
base_url="http://localhost:8080/",
base_url="http://localhost:8080",
max_tokens=100,
model="text-to-image",
temperature=0.5,
Expand Down
4 changes: 3 additions & 1 deletion weaviate/collections/classes/generative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@


def _parse_anyhttpurl(url: Optional[AnyHttpUrl]) -> Optional[str]:
return str(url) if url is not None else None
if url is None:
return None
return str(url).strip("/")


def _to_text_array(values: Optional[Iterable[str]]) -> Optional[TextArray]:
Expand Down
Loading