Adjust the type hint for Graph open to reflect a SPARQLUpdateStore configuration

Also adjust the type hint for ReadOnlyGraphAggregate and for further stores

Author: white-gecko

rdflib/graph.py

@@ -607,7 +607,9 @@ def rollback(self: _GraphT) -> _GraphT:
  self.__store.rollback()
  return self
 
- def open(self, configuration: str, create: bool = False) -> int | None:
+ def open(
+ self, configuration: str | tuple[str, str], create: bool = False
+ ) -> int | None:
  """Open the graph store
 
  Might be necessary for stores that require opening a connection to a
@@ -3027,7 +3029,7 @@ def commit(self) -> NoReturn:
  def rollback(self) -> NoReturn:
  raise ModificationException()
 
- def open(self, configuration: str, create: bool = False) -> None:
+ def open(self, configuration: str | tuple[str, str], create: bool = False) -> None:
  # TODO: is there a use case for this method?
  for graph in self.graphs:
  # type error: Too many arguments for "open" of "Graph"

rdflib/plugins/stores/auditable.py

@@ -65,7 +65,9 @@ def __init__(self, store: Store):
  ] = []
  self.rollbackLock = threading.RLock()
 
- def open(self, configuration: str, create: bool = True) -> int | None:
+ def open(
+ self, configuration: str | tuple[str, str], create: bool = True
+ ) -> int | None:
  return self.store.open(configuration, create)
 
  def close(self, commit_pending_transaction: bool = False) -> None:

rdflib/plugins/stores/berkeleydb.py

@@ -126,10 +126,16 @@ def _init_db_environment(
  def is_open(self) -> bool:
  return self.__open
 
- def open(self, path: str, create: bool = True) -> int | None:
+ def open(
+ self, configuration: str | tuple[str, str], create: bool = True
+ ) -> int | None:
  if not has_bsddb:
  return NO_STORE
- homeDir = path # noqa: N806
+
+ if type(configuration) is str:
+ homeDir = configuration # noqa: N806
+ else:
+ raise Exception("Invalid configuration provided")
 
  if self.__identifier is None:
  self.__identifier = URIRef(pathname2url(abspath(homeDir)))

rdflib/plugins/stores/sparqlstore.py

@@ -184,11 +184,11 @@ def __init__(
  self._queries = 0
 
  # type error: Missing return statement
- def open(self, configuration: str, create: bool = False) -> int | None: # type: ignore[return]
+ def open(self, configuration: str | tuple[str, str], create: bool = False) -> int | None: # type: ignore[return]
  """This method is included so that calls to this Store via Graph, e.g. Graph("SPARQLStore"),
  can set the required parameters
  """
- if type(configuration) == str: # noqa: E721
+ if type(configuration) is str:
  self.query_endpoint = configuration
  else:
  raise Exception(

rdflib/store.py

@@ -184,11 +184,13 @@ def node_pickler(self) -> NodePickler:
  def create(self, configuration: str) -> None:
  self.dispatcher.dispatch(StoreCreatedEvent(configuration=configuration))
 
- def open(self, configuration: str, create: bool = False) -> int | None:
- """Opens the store specified by the configuration string.
+ def open(
+ self, configuration: str | tuple[str, str], create: bool = False
+ ) -> int | None:
+ """Opens the store specified by the configuration.
 
  Args:
- configuration: Store configuration string
+ configuration: Store configuration as string or tuple
  create: If True, a store will be created if it doesn't exist.
  If False and the store doesn't exist, an exception is raised.