Removed baseURL support for python client

Author: Jinash Rouniyar

test/collection/test_classes_generative.py

@@ -416,7 +416,6 @@ def test_generative_parameters_images_parsing(
         ),
         (
             GenerativeConfig.contextualai(
-                base_url="http://localhost:8080",
                 model="v2",
                 max_tokens=100,
                 temperature=0.5,
@@ -427,7 +426,6 @@ def test_generative_parameters_images_parsing(
             generative_pb2.GenerativeProvider(
                 return_metadata=True,
                 contextualai=generative_pb2.GenerativeContextualAI(
-                    base_url="http://localhost:8080",
                     model="v2",
                     max_tokens=100,
                     temperature=0.5,

test/collection/test_config.py

@@ -1057,7 +1057,6 @@ def test_config_with_vectorizer_and_properties(
             top_p=0.9,
             system_prompt="You are a helpful assistant that provides accurate and informative responses based on the given context.",
             avoid_commentary=False,
-            base_url="https://api.contextual.ai",
         ),
         {
             "generative-contextualai": {
@@ -1067,7 +1066,6 @@ def test_config_with_vectorizer_and_properties(
                 "topPProperty": 0.9,
                 "systemPromptProperty": "You are a helpful assistant that provides accurate and informative responses based on the given context.",
                 "avoidCommentaryProperty": False,
-                "baseURL": "https://api.contextual.ai/",
             }
         },
     ),
@@ -1164,14 +1162,12 @@ def test_config_with_generative(
             model="ctxl-rerank-v2-instruct-multilingual",
             instruction="Prioritize recent documents",
             top_n=5,
-            base_url="https://api.contextual.ai",
         ),
         {
             "reranker-contextualai": {
                 "model": "ctxl-rerank-v2-instruct-multilingual",
                 "instruction": "Prioritize recent documents",
                 "topN": 5,
-                "baseURL": "https://api.contextual.ai",
             }
         },
     ),

weaviate/collections/classes/config.py

@@ -465,20 +465,13 @@ class _GenerativeContextualAIConfig(_GenerativeProvider):
     generative: Union[GenerativeSearches, _EnumLikeStr] = Field(
         default=GenerativeSearches.CONTEXTUALAI, frozen=True, exclude=True
     )
-    baseURL: Optional[AnyHttpUrl]
     model: Optional[str]
     maxTokensProperty: Optional[int]
     temperatureProperty: Optional[float]
     topPProperty: Optional[float]
     systemPromptProperty: Optional[str]
     avoidCommentaryProperty: Optional[bool]
 
-    def _to_dict(self) -> Dict[str, Any]:
-        ret_dict = super()._to_dict()
-        if self.baseURL is not None:
-            ret_dict["baseURL"] = self.baseURL.unicode_string()
-        return ret_dict
-
 
 class _GenerativeGoogleConfig(_GenerativeProvider):
     generative: Union[GenerativeSearches, _EnumLikeStr] = Field(
@@ -597,16 +590,9 @@ class _RerankerContextualAIConfig(_RerankerProvider):
         default=Rerankers.CONTEXTUALAI, frozen=True, exclude=True
     )
     model: Optional[Union[RerankerContextualAIModel, str]] = Field(default=None)
-    baseURL: Optional[AnyHttpUrl]
     instruction: Optional[str] = Field(default=None)
     topN: Optional[int] = Field(default=None)
 
-    def _to_dict(self) -> Dict[str, Any]:
-        ret_dict = super()._to_dict()
-        if self.baseURL is not None:
-            ret_dict["baseURL"] = self.baseURL.unicode_string()
-        return ret_dict
-
 
 class _Generative:
     """Use this factory class to create the correct object for the `generative_config` argument in the `collections.create()` method.
@@ -883,7 +869,6 @@ def contextualai(
         top_p: Optional[float] = None,
         system_prompt: Optional[str] = None,
         avoid_commentary: Optional[bool] = None,
-        base_url: Optional[AnyHttpUrl] = None,
     ) -> _GenerativeProvider:
         """Create a `_GenerativeContextualAIConfig` object for use when performing AI generation using the `generative-contextualai` module.
 
@@ -897,10 +882,8 @@ def contextualai(
             top_p: Nucleus sampling parameter (0 < x <= 1). Defaults to `None`, which uses the server-defined default
             system_prompt: System instructions the model follows. Defaults to `None`, which uses the server-defined default
             avoid_commentary: If `True`, reduce conversational commentary in responses. Defaults to `None`, which uses the server-defined default
-            base_url: The base URL where the API request should go. Defaults to `None`, which uses the server-defined default
         """
         return _GenerativeContextualAIConfig(
-            baseURL=base_url,
             maxTokensProperty=max_tokens,
             model=model,
             temperatureProperty=temperature,
@@ -1131,7 +1114,6 @@ def nvidia(
     @staticmethod
     def contextualai(
         model: Optional[str] = None,
-        base_url: Optional[AnyHttpUrl] = None,
         instruction: Optional[str] = None,
         top_n: Optional[int] = None,
     ) -> _RerankerProvider:
@@ -1142,13 +1124,11 @@ def contextualai(
 
         Args:
             model: The model to use. Defaults to `None`, which uses the server-defined default
-            base_url: The base URL to send the reranker requests to. Defaults to `None`, which uses the server-defined default.
             instruction: Custom instructions for reranking. Defaults to `None`.
             top_n: Number of top results to return. Defaults to `None`, which uses the server-defined default.
         """
         return _RerankerContextualAIConfig(
             model=model, 
-            baseURL=base_url,
             instruction=instruction,
             topN=top_n
         )

weaviate/collections/classes/generative.py

@@ -449,7 +449,6 @@ class _GenerativeContextualAI(_GenerativeConfigRuntime):
     generative: Union[GenerativeSearches, _EnumLikeStr] = Field(
         default=GenerativeSearches.CONTEXTUALAI, frozen=True, exclude=True
     )
-    base_url: Optional[AnyHttpUrl]
     model: Optional[str]
     max_tokens: Optional[int]
     temperature: Optional[float]
@@ -462,7 +461,6 @@ def _to_grpc(self, opts: _GenerativeConfigRuntimeOptions) -> generative_pb2.Gene
         return generative_pb2.GenerativeProvider(
             return_metadata=opts.return_metadata,
             contextualai=generative_pb2.GenerativeContextualAI(
-                base_url=_parse_anyhttpurl(self.base_url),
                 model=self.model,
                 max_tokens=self.max_tokens,
                 temperature=self.temperature,
@@ -611,7 +609,6 @@ def cohere(
     @staticmethod
     def contextualai(
         *,
-        base_url: Optional[str] = None,
         model: Optional[str] = None,
         max_tokens: Optional[int] = None,
         temperature: Optional[float] = None,
@@ -622,7 +619,6 @@ def contextualai(
         """Create a `_GenerativeContextualAI` object for use with the `generative-contextualai` module.
 
         Args:
-            base_url: The base URL where the API request should go. Defaults to `None`, which uses the server-defined default
             model: The model to use. Defaults to `None`, which uses the server-defined default
             max_tokens: The maximum number of tokens to generate. Defaults to `None`, which uses the server-defined default
             temperature: The temperature to use. Defaults to `None`, which uses the server-defined default
@@ -631,7 +627,6 @@ def contextualai(
             avoid_commentary: Whether to avoid model commentary in responses
         """
         return _GenerativeContextualAI(
-            base_url=AnyUrl(base_url) if base_url is not None else None,
             model=model,
             max_tokens=max_tokens,
             temperature=temperature,