Changes to support major solr upgrade to 10

Author: eikek

components/renku_data_services/solr/solr_client.py

@@ -54,6 +54,7 @@ class SolrClientConfig:
     core: str
     user: Optional[SolrUser] = None
     timeout: int = 600
+    major_version: str = "9"
     configset: str = "_default"
 
     @classmethod
@@ -63,6 +64,7 @@ def from_env(cls) -> SolrClientConfig:
         core = os.environ.get("SOLR_CORE", "renku-search")
         username = os.environ.get("SOLR_USER")
         password = os.environ.get("SOLR_PASSWORD")
+        maj_version = os.environ.get("SOLR_MAJOR_VERSION", "9")
 
         tstr = os.environ.get("SOLR_REQUEST_TIMEOUT", "600")
         try:
@@ -72,7 +74,7 @@ def from_env(cls) -> SolrClientConfig:
             timeout = 600
 
         user = SolrUser(username=username, password=str(password)) if username is not None else None
-        return cls(url, core, user, timeout)
+        return cls(url, core, user, timeout, maj_version)
 
     def __str__(self) -> str:
         return (
@@ -792,10 +794,23 @@ async def core_status(self, core_name: str | None) -> dict[str, Any] | None:
             # if the core doesn't exist, solr returns 200 with an empty body
             return data if data.get("name") == self.config.core else None
 
+    async def create_collection(self, coll_name: str | None) -> None:
+        """Create a collection with the given name or the name from the config object."""
+        coll = coll_name or self.config.core
+        data = {"name": coll, "numShards": 1}
+        resp = await self.delegate.post("/api/collections", json=data)
+        if not resp.is_success:
+            raise SolrClientCreateCoreException(coll, resp)
+        else:
+            return None
+
     async def create(self, core_name: str | None) -> None:
         """Create a core with the given `core_name` or the name provided in the config object."""
         core = core_name or self.config.core
-        data = {"create": {"name": core, "configSet": self.config.configset}}
+        data: dict[str, Any] = {"create": {"name": core, "configSet": self.config.configset}}
+        if self.config.major_version == "10":
+            await self.create_collection(core)
+            data = {"name": core}
         resp = await self.delegate.post("/api/cores", json=data)
         if not resp.is_success:
             raise SolrClientCreateCoreException(core, resp)