educelab-hercdb 0.1.0.dev1__tar.gz → 0.1.0.dev2__tar.gz

{educelab_hercdb-0.1.0.dev1 → educelab_hercdb-0.1.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educelab-hercdb
-Version: 0.1.0.dev1
+Version: 0.1.0.dev2
 Summary: Graph database API for Herculaneum data
 Author-email: Mami Hayashida <mami.hayashida@uky.edu>, Seth Parker <c.seth.parker@uky.edu>
 Project-URL: Repository, https://gitlab.com/educelab/herculaneum-graph-db

{educelab_hercdb-0.1.0.dev1 → educelab_hercdb-0.1.0.dev2}/pyproject.toml

@@ -8,7 +8,7 @@ include = ["educelab.hercdb"]
 
 [project]
 name = "educelab-hercdb"
-version = "0.1.0.dev1"
+version = "0.1.0.dev2"
 dependencies = [
     "neo4j>=5.20",
     "numpy>=2.0",

educelab_hercdb-0.1.0.dev2/src/educelab/hercdb/__init__.py

@@ -0,0 +1,3 @@
+from educelab.hercdb import config
+from educelab.hercdb.api import (connect, GraphDBConnection, FlatbedScanType,
+                                 PGSRawType, SpectralRawType)

{educelab_hercdb-0.1.0.dev1 → educelab_hercdb-0.1.0.dev2}/src/educelab/hercdb/api.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Optional
 from enum import Enum
 
 from neo4j import GraphDatabase
@@ -19,7 +18,7 @@ PGSRawType = DatasetType.PGSRaw
 SpectralRawType = DatasetType.SpectralRaw
 
 
-class _GraphConnector:
+class GraphDBConnection:
     logger = logging.getLogger('hercdb.connector')
     uri: str = None
     user: str = None
@@ -35,11 +34,15 @@ class _GraphConnector:
     def close(self):
         self.driver.close()
 
-    def verify_conn(self):
-        self.driver.verify_connectivity()
-        self.logger.info(f"connected to {self.uri} as '{self.user}'")
+    def verify_connection(self):
+        try:
+            self.driver.verify_connectivity()
+            return True
+        except Exception as e:
+            self.logger.debug('failed to connect', exc_info=e)
+            return False
 
-    def delete_all(self):
+    def _delete_all(self):
         records, summary, keys = self.driver.execute_query(
             """
             MATCH (n)
@@ -48,7 +51,7 @@ class _GraphConnector:
             database_="neo4j",
         )
 
-    def return_all(self):
+    def _return_all(self):
         records, summary, keys = self.driver.execute_query(
             """
             MATCH (n)
@@ -60,7 +63,7 @@ class _GraphConnector:
         self.logger.debug(summary)
         self.logger.debug(keys)
 
-    def node_count(self) -> int:
+    def _node_count(self) -> int:
         record, keys, summary = self.driver.execute_query(
             """
             MATCH (n)
@@ -90,7 +93,7 @@ class _GraphConnector:
                 pherc_n = records[0]["ph.human_name"]
                 corn_n = records[0]["c.human_name"]
 
-        if pezzo:
+        if pezzo is not None:
             # Currently this is irrelevant since there are no pezzo with "names"
             records, summary, keys = self.driver.execute_query(
                 """
@@ -168,11 +171,7 @@ class _GraphConnector:
         return properties
 
 
-# Server connector instance
-_connector: Optional[_GraphConnector] = None
-
-
-def connect(uri=None, user=None, password=None) -> bool:
+def connect(uri=None, user=None, password=None) -> GraphDBConnection:
     # use system config values if not provided
     from educelab.hercdb import config
     if uri is None:
@@ -182,51 +181,6 @@ def connect(uri=None, user=None, password=None) -> bool:
     if password is None:
         password = config.password
 
-    # close existing connection
-    global _connector
-    if _connector is not None:
-        disconnect()
-
     # open new connection
-    _connector = _GraphConnector(uri, user, password)
-    return verify_connection()
-
-
-def disconnect():
-    global _connector
-    if _connector is not None:
-        _connector.close()
-        _connector = None
-
-
-def verify_connection() -> bool:
-    if _connector is None:
-        return False
-    try:
-        _connector.verify_conn()
-        return True
-    except Exception as e:
-        logging.getLogger(__name__).debug('failed to connect', exc_info=e)
-        return False
-
-
-def node_count() -> int:
-    if _connector is None:
-        return -1
-    else:
-        return _connector.node_count()
-
-
-def get_display_name(*args, **kwargs):
-    if _connector is not None:
-        return _connector.get_human_readable_name(*args, **kwargs)
-
-
-def list_cornici_pezzi(*args, **kwargs):
-    if _connector is not None:
-        return _connector.list_cornici_pezzi(*args, **kwargs)
-
-
-def find_datasets(*args, **kwargs):
-    if _connector is not None:
-        return _connector.find_datasets(*args, **kwargs)
+    db = GraphDBConnection(uri, user, password)
+    return db

{educelab_hercdb-0.1.0.dev1 → educelab_hercdb-0.1.0.dev2}/src/educelab_hercdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educelab-hercdb
-Version: 0.1.0.dev1
+Version: 0.1.0.dev2
 Summary: Graph database API for Herculaneum data
 Author-email: Mami Hayashida <mami.hayashida@uky.edu>, Seth Parker <c.seth.parker@uky.edu>
 Project-URL: Repository, https://gitlab.com/educelab/herculaneum-graph-db

educelab_hercdb-0.1.0.dev1/src/educelab/hercdb/__init__.py

@@ -1,6 +0,0 @@
-from educelab.hercdb import config
-from educelab.hercdb.api import (connect, node_count, disconnect,
-                                 list_cornici_pezzi, find_datasets,
-                                 get_display_name, verify_connection)
-
-from educelab.hercdb.api import (FlatbedScanType, PGSRawType, SpectralRawType)