OneStop4All-Indexer 2.8.0.dev7__tar.gz → 2.8.0.dev9__tar.gz

{onestop4all_indexer-2.8.0.dev7 → onestop4all_indexer-2.8.0.dev9/OneStop4All_Indexer.egg-info}/PKG-INFO

@@ -1,18 +1,21 @@
 Metadata-Version: 2.4
 Name: OneStop4All-Indexer
-Version: 2.8.0.dev7
+Version: 2.8.0.dev9
 Summary: Library to harvest data from NFDI4Earth-KnowledgeHub to OneStop4All-Index
 Author: Markus Konkol, Arne Vogt, Tom Niers, Ralf Klammer
 Author-email: m.konkol@52north.org, a.vogt@52north.org, tom.niers@tu-dresden.de, ralf.klammer@tu-dresden.de
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: sparqlwrapper~=2.0.0
-Requires-Dist: pysolr~=3.9.0
+Requires-Dist: pysolr~=3.11.0
 Requires-Dist: jproperties~=2.1.1
 Requires-Dist: geomet~=1.1.0
 Requires-Dist: shapely~=2.0.5
+Provides-Extra: airflow
+Requires-Dist: apache-airflow==3.1.7; extra == "airflow"
 Dynamic: author
 Dynamic: author-email
 Dynamic: license-file
+Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{onestop4all_indexer-2.8.0.dev7 → onestop4all_indexer-2.8.0.dev9}/OneStop4All_Indexer.egg-info/requires.txt

@@ -1,6 +1,9 @@
 click
 sparqlwrapper~=2.0.0
-pysolr~=3.9.0
+pysolr~=3.11.0
 jproperties~=2.1.1
 geomet~=1.1.0
 shapely~=2.0.5
+
+[airflow]
+apache-airflow==3.1.7

{onestop4all_indexer-2.8.0.dev7/OneStop4All_Indexer.egg-info → onestop4all_indexer-2.8.0.dev9}/PKG-INFO

@@ -1,18 +1,21 @@
 Metadata-Version: 2.4
 Name: OneStop4All-Indexer
-Version: 2.8.0.dev7
+Version: 2.8.0.dev9
 Summary: Library to harvest data from NFDI4Earth-KnowledgeHub to OneStop4All-Index
 Author: Markus Konkol, Arne Vogt, Tom Niers, Ralf Klammer
 Author-email: m.konkol@52north.org, a.vogt@52north.org, tom.niers@tu-dresden.de, ralf.klammer@tu-dresden.de
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: sparqlwrapper~=2.0.0
-Requires-Dist: pysolr~=3.9.0
+Requires-Dist: pysolr~=3.11.0
 Requires-Dist: jproperties~=2.1.1
 Requires-Dist: geomet~=1.1.0
 Requires-Dist: shapely~=2.0.5
+Provides-Extra: airflow
+Requires-Dist: apache-airflow==3.1.7; extra == "airflow"
 Dynamic: author
 Dynamic: author-email
 Dynamic: license-file
+Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{onestop4all_indexer-2.8.0.dev7 → onestop4all_indexer-2.8.0.dev9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="OneStop4All-Indexer",
-    version="2.8.0.dev7",
+    version="2.8.0.dev9",
     description="Library to harvest data from NFDI4Earth-KnowledgeHub to OneStop4All-Index",
     author="Markus Konkol, Arne Vogt, Tom Niers, Ralf Klammer",
     author_email="m.konkol@52north.org, a.vogt@52north.org, tom.niers@tu-dresden.de, ralf.klammer@tu-dresden.de",
@@ -10,11 +10,14 @@ setup(
     install_requires=[
         "click",
         "sparqlwrapper~= 2.0.0",
-        "pysolr~= 3.9.0",
+        "pysolr~= 3.11.0",
         "jproperties~= 2.1.1 ",
         "geomet ~= 1.1.0",
         "shapely ~= 2.0.5",
     ],
+    extras_require={
+        "airflow": ["apache-airflow==3.1.7"],
+    },
     include_package_data=True,
     entry_points={
         "console_scripts": [

{onestop4all_indexer-2.8.0.dev7 → onestop4all_indexer-2.8.0.dev9}/utils/solr.py

@@ -3,7 +3,6 @@ import logging
 from pysolr import Solr as SolrBase
 from requests.auth import HTTPBasicAuth
 from typing import List, Dict, Optional, Literal
-from urllib.parse import urljoin
 
 from utils import config
 
@@ -33,9 +32,10 @@ class Solr(object):
     def endpoint(self):
         # using config-values (by default) OR
         # overwrite with initially given values
+        # TODO: check if endpoint is reachable, if not raise error
         solr_url = self.solr_url if self.solr_url else config["solr_url"]
         solr_core = self.solr_core if self.solr_core else config["solr_core"]
-        return urljoin(solr_url, solr_core)
+        return f"{solr_url.rstrip('/')}/{solr_core}"
 
     @property
     def authentication(self):
@@ -112,4 +112,7 @@ class SolrValidator(Solr):
             return False
 
     def close(self):
-        self.solr.delete({"id": "geomValidationTest"})
+        # technically not necessary to check existence of test document,
+        # but when urls are misconfigured, this will throw an error
+        if self.solr.search("id:geomValidationTest").hits:
+            self.solr.delete(q="id:geomValidationTest")