Update to work with dataset

Author: antaldaniel

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: wbdataset
 Title: Making Datasets Truly Interoperable and Reusable in R with Wikibase
-Version: 0.1.1050
-Date: 2024-04-20
+Version: 0.1.1051
+Date: 2024-05-17
 Authors@R: 
     c(person(given="Daniel", family="Antal", 
            email= "daniel.antal@dataobservatory.eu", 

R/add_statement.R

@@ -17,6 +17,7 @@ add_statement <- function(
     wikibase_type = c("item", "string", "numeric", "external-id"),
     wikibase_api_url = "https://reprexbase.eu/demowiki/api.php",
     csrf) {
+
   if (!is.character(wikibase_type) || length(wikibase_type) != 1) {
     stop("add_statement(): 'wikibase_type' must be a single character string.")
   }

R/copy_wikidata_item.R

@@ -29,15 +29,20 @@
 #' @param wikibase_api_url The full URL of the Wikibase API, which is the
 #'   address that the \code{wbdataset} R client sends requests to when
 #'   interacting with the knowledge base. For example,
-#'   \code{'https://reprexbase.eu/demowiki/api.php'}. The URL must end with
-#'   api.php.
+#'   \code{'https://reprexbase.eu/jekyll/api.php'}. The URL must end with
+#'   api.php. It is either given as a parameter or resolved from
+#'   \code{wikibase_session}.
 #' @param data_curator The name of the data curator who runs the function and
 #'   creates the log file, created with \link[utils]{person}.
+#'   It is either given as a parameter or resolved from
+#'   \code{wikibase_session}. If no curator is given, then filled with
+#'   \code{person("Unknown", "Curator")}.
 #' @param log_file_name An explicitly stated full path to a possible CSV log
 #'   file, defaults to \code{NULL}. If the value is \code{NULL}, no log file
 #'   will be created.
 #' @param csrf The CSRF token of your session, received with
-#'   \code{\link{get_csrf}}.
+#'   \code{\link{get_csrf}}. It is either given as a parameter or resolved
+#'   from \code{wikibase_session}.
 #' @param wikibase_session An optional named list of default values to reuse
 #'   across multiple function calls. If any of the main parameters (such as
 #'   \code{language}, \code{data_curator}, \code{log_file_name},
@@ -77,10 +82,10 @@ copy_wikidata_item <- function(
     language = "en",
     classification_property = NA_character_,
     classification_id = NA_character_,
-    wikibase_api_url,
+    wikibase_api_url = NULL,
     data_curator = NULL,
     log_file_name = NULL,
-    csrf,
+    csrf = NULL,
     wikibase_session = NULL) {
 
   language <- resolve_from_session("language", language, wikibase_session)
@@ -91,6 +96,9 @@ copy_wikidata_item <- function(
   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
   qid_equivalence_property <- resolve_from_session("qid_equivalence_property", qid_equivalence_property, wikibase_session)
 
+  if (is.null(data_curator)) {
+    data_curator <- person("Unknown", "Curator", role = "dtm")
+  }
 
   validate_copy_entity_args(
     language = language,
@@ -139,7 +147,7 @@ copy_wikidata_item <- function(
 
   # Assert that qid_on_wikidata looks like a QID
   qid_on_wikidata <- as.character(qid_on_wikidata)
-  assertthat::assert_that(is_qid(qid_on_wikidata),
+  assert_that(is_qid(qid_on_wikidata),
     msg = "qid_on_wikidata must start with Q followed by digits."
   )
 

R/copy_wikidata_property.R

@@ -31,15 +31,20 @@
 #' @param wikibase_api_url The full URL of the Wikibase API, which is the
 #'   address that the \code{wbdataset} R client sends requests to when
 #'   interacting with the knowledge base. For example,
-#'   \code{'https://reprexbase.eu/demowiki/api.php'}. The URL must end with
-#'   api.php.
+#'   \code{'https://reprexbase.eu/jekyll/api.php'}. The URL must end with
+#'   api.php. It is either given as a parameter or resolved from
+#'   \code{wikibase_session}.
 #' @param data_curator The name of the data curator who runs the function and
 #'   creates the log file, created with \link[utils]{person}.
+#'   It is either given as a parameter or resolved from
+#'   \code{wikibase_session}. If no curator is given, then filled with
+#'   \code{person("Unknown", "Curator")}.
 #' @param log_file_name An explicitly stated full path to a possible CSV log
 #'   file, defaults to \code{NULL}. If the value is \code{NULL}, no log file
 #'   will be created.
 #' @param csrf The CSRF token of your session, received with
-#'   \code{\link{get_csrf}}.
+#'   \code{\link{get_csrf}}. It is either given as a parameter or resolved
+#'   from \code{wikibase_session}.
 #' @param wikibase_session An optional named list of default values to reuse
 #'   across multiple function calls. If any of the main parameters (such as
 #'   \code{language}, \code{data_curator}, \code{log_file_name},
@@ -77,14 +82,14 @@ copy_wikidata_property <- function(
     pid_on_wikidata,
     pid_equivalence_property,
     language = "en",
-    wikibase_api_url,
+    wikibase_api_url = NULL,
     classification_property = NA_character_,
     classification_id = NA_character_,
     equivalence_property = NA_character_,
     equivalence_id = NA_character_,
     data_curator = NULL,
     log_file_name = NULL,
-    csrf,
+    csrf = NULL,
     wikibase_session = NULL) {
 
   language <- resolve_from_session("language", language, wikibase_session)
@@ -97,6 +102,10 @@ copy_wikidata_property <- function(
 
   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
 
+  if (is.null(data_curator)) {
+    data_curator <- person("Unknown", "Curator", role = "dtm")
+  }
+
   validate_copy_entity_args(
     language = language,
     wikibase_api_url = wikibase_api_url,

R/create_item.R

@@ -33,15 +33,20 @@
 #' @param wikibase_api_url The full URL of the Wikibase API, which is the
 #'   address that the \code{wbdataset} R client sends requests to when
 #'   interacting with the knowledge base. For example,
-#'   \code{'https://reprexbase.eu/demowiki/api.php'}. The URL must end with
-#'   api.php.
+#'   \code{'https://reprexbase.eu/jekyll/api.php'}. The URL must end with
+#'   api.php. It is either given as a parameter or resolved from
+#'   \code{wikibase_session}.
 #' @param data_curator The name of the data curator who runs the function and
 #'   creates the log file, created with \link[utils]{person}.
+#'   It is either given as a parameter or resolved from
+#'   \code{wikibase_session}. If no curator is given, then filled with
+#'   \code{person("Unknown", "Curator")}.
 #' @param log_file_name An explicitly stated full path to a possible CSV log
 #'   file, defaults to \code{NULL}. If the value is \code{NULL}, no log file
 #'   will be created.
 #' @param csrf The CSRF token of your session, received with
-#'   \code{\link{get_csrf}}.
+#'   \code{\link{get_csrf}}. It is either given as a parameter or resolved
+#'   from \code{wikibase_session}.
 #' @param wikibase_session An optional named list of default values to reuse
 #'   across multiple function calls. If any of the main parameters (such as
 #'   \code{language}, \code{data_curator}, \code{log_file_name},
@@ -98,11 +103,11 @@ create_item <- function(label,
                         equivalence_id = NA_character_,
                         classification_property = NA_character_,
                         classification_id = NA_character_,
-                        wikibase_api_url,
+                        wikibase_api_url = NULL,
                         data_curator = NULL,
                         log_file_name = NULL,
-                        csrf,
-                        wikibase_session=NULL) {
+                        csrf = NULL,
+                        wikibase_session = NULL) {
 
   language <- resolve_from_session("language", language, wikibase_session)
   data_curator <- resolve_from_session("data_curator", data_curator, wikibase_session)
@@ -112,6 +117,10 @@ create_item <- function(label,
   classification_property <- resolve_from_session("wikibase_api_url", classification_property , wikibase_session)
   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
 
+  if (is.null(data_curator)) {
+    data_curator <- person("Unknown", "Curator", role = "dtm")
+  }
+
   validate_create_entity_args(
     label = label,
     description = description,

R/create_property.R

@@ -35,13 +35,23 @@
 #'   interacting with the knowledge base. For example,
 #'   \code{'https://reprexbase.eu/demowiki/api.php'}. The URL must end with
 #'   api.php.
+#' @param wikibase_api_url The full URL of the Wikibase API, which is the
+#'   address that the \code{wbdataset} R client sends requests to when
+#'   interacting with the knowledge base. For example,
+#'   \code{'https://reprexbase.eu/jekyll/api.php'}. The URL must end with
+#'   api.php. It is either given as a parameter or resolved from
+#'   \code{wikibase_session}.
 #' @param data_curator The name of the data curator who runs the function and
 #'   creates the log file, created with \link[utils]{person}.
-#' @param csrf The CSRF token of your session, received with
-#'   \code{\link{get_csrf}}.
+#'   It is either given as a parameter or resolved from
+#'   \code{wikibase_session}. If no curator is given, then filled with
+#'   \code{person("Unknown", "Curator")}.
 #' @param log_file_name An explicitly stated full path to a possible CSV log
 #'   file, defaults to \code{NULL}. If the value is \code{NULL}, no log file
 #'   will be created.
+#' @param csrf The CSRF token of your session, received with
+#'   \code{\link{get_csrf}}. It is either given as a parameter or resolved
+#'   from \code{wikibase_session}.
 #' @param wikibase_session An optional named list of default values to reuse
 #'   across multiple function calls. If any of the main parameters (such as
 #'   \code{language}, \code{data_curator}, \code{log_file_name},
@@ -94,10 +104,10 @@ create_property <- function(label,
                             datatype,
                             equivalence_property = NA_character_,
                             equivalence_id = NA_character_,
-                            wikibase_api_url,
+                            wikibase_api_url = NULL,
                             data_curator = NULL,
                             log_file_name = NULL,
-                            csrf,
+                            csrf = NULL,
                             wikibase_session = NULL) {
 
   language <- resolve_from_session("language", language, wikibase_session)
@@ -111,6 +121,10 @@ create_property <- function(label,
     stop ("create_property(..., datatype): ", datatype, " is not a valid Wikibase property type.")
   }
 
+  if (is.null(data_curator)) {
+    data_curator <- person("Unknown", "Curator", role = "dtm")
+  }
+
   validate_create_entity_args(
     label = label,
     description = description,