bug fix with create_item

Author: antaldaniel

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: wbdataset
 Title: Making Datasets Truly Interoperable and Reusable in R with Wikibase
-Version: 0.1.1048
-Date: 2024-04-19
+Version: 0.1.1050
+Date: 2024-04-20
 Authors@R: 
     c(person(given="Daniel", family="Antal", 
            email= "[email protected]", 

R/copy_wikidata_item.R

@@ -72,12 +72,12 @@
 #' @export
 
 copy_wikidata_item <- function(
-    qid_on_wikidata = "Q4",
-    qid_equivalence_property = "P35",
-    language = c("en", "nl", "hu"),
+    qid_on_wikidata,
+    qid_equivalence_property,
+    language = "en",
     classification_property = NA_character_,
     classification_id = NA_character_,
-    wikibase_api_url = "https://reprexbase.eu/jekyll/api.php",
+    wikibase_api_url,
     data_curator = NULL,
     log_file_name = NULL,
     csrf,
@@ -87,7 +87,6 @@ copy_wikidata_item <- function(
   data_curator <- resolve_from_session("data_curator", data_curator, wikibase_session)
   log_file_name <- resolve_from_session("log_file_name", log_file_name, wikibase_session)
   wikibase_api_url <- resolve_from_session("wikibase_api_url", wikibase_api_url, wikibase_session)
-  equivalence_property <- resolve_from_session("wikibase_api_url", equivalence_property, wikibase_session)
   classification_property <- resolve_from_session("wikibase_api_url", classification_property, wikibase_session)
   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
   qid_equivalence_property <- resolve_from_session("qid_equivalence_property", qid_equivalence_property, wikibase_session)
@@ -98,8 +97,8 @@ copy_wikidata_item <- function(
     wikibase_api_url = wikibase_api_url,
     classification_property = classification_property,
     classification_id = classification_id,
-    equivalence_property = equivalence_property,
-    equivalence_id = equivalence_id,
+    equivalence_property = NA_character_,
+    equivalence_id = NA_character_,
     csrf = csrf,
     data_curator = data_curator,
     validated_action = "copy_wikidata_property()"

R/copy_wikidata_property.R

@@ -75,9 +75,9 @@
 
 copy_wikidata_property <- function(
     pid_on_wikidata,
-    pid_equivalence_property = "P2",
+    pid_equivalence_property,
     language = "en",
-    wikibase_api_url = "https://reprexbase.eu/jekyll/api.php",
+    wikibase_api_url,
     classification_property = NA_character_,
     classification_id = NA_character_,
     equivalence_property = NA_character_,

R/create_item.R

@@ -176,28 +176,26 @@ create_item <- function(label,
   # See get_csrf, get_csrf_token.
   csrf_token <- get_csrf_token(csrf)
 
-  if(!is_valid_csrf(csrf_token)) {
+  if(!is_valid_csrf_token(csrf_token)) {
     stop("create_item(, csrf): csfr does not seem to be valid.")
   }
 
-  safe_edit <- purrr::safely(call_wbeditentity)
+  # safe_edit <- purrr::safely(call_wbeditentity)
 
   # Posting the new property ----------------------------------------------
-  new_item <-safe_edit(
-    csrf_token = csrf,
-    wikibase_api_url = wikibase_api_url,
-    entity_data = json_data,
-    new_entity_type = "item",
-    csrf_handle = csrf,
-    bot = TRUE,
-    summary = glue::glue("Creating item for '{label}'")
+  new_item <- httr::POST(
+    wikibase_api_url,
+    body = list(
+      action = "wbeditentity",
+      new    = "item",
+      data   = datastring,
+      token  = csrf_token,
+      format = "json"
+    ),
+    encode = "form",
+    handle = csrf
   )
 
-  if (!is.null(new_item$error)) {
-    warning("create_item(): Failed to create item — ", new_item$error$message)
-    return(NULL)  # or structured error return
-  }
-
   # See if the created POST via wbeditentity was successful
   created_item_response <- httr::content(new_item,
                                          as = "parsed",

R/create_property.R

@@ -125,8 +125,6 @@ create_property <- function(label,
     validated_action = "create_property()"
   )
 
-
-
   # Save the time of running the code
   action_time <- Sys.time()
   action_timestamp <- action_timestamp_create()
@@ -185,13 +183,9 @@ create_property <- function(label,
   # See get_csrf, get_csrf_token.
   csrf_token <- get_csrf_token(csrf)
 
-  assertthat::assert_that(!is.null(csrf_token),
-                          msg = "You do not have a CSRF token"
-  )
-
-  assertthat::assert_that(nchar(csrf_token) == 42,
-                          msg = "Your CSRF token should have 42 characters."
-  )
+  if(!is_valid_csrf_token(csrf_token)) {
+    stop("create_item(, csrf): csfr does not seem to be valid.")
+  }
 
   # Posting the new property ----------------------------------------------
   new_property <- httr::POST(

R/utils.R

@@ -33,7 +33,6 @@ get_return_ds_structure <- function() {
   )
 }
 
-
 #' @title Check if a CSRF token appears valid
 #' @description Validates the basic structure of a MediaWiki-style CSRF token.
 #' @param csrf_token A single character string representing the token.
@@ -45,3 +44,29 @@ is_valid_csrf_token <- function(csrf_token) {
   }
   ifelse(nchar(csrf_token)>10, TRUE, FALSE)
 }
+
+#' @keywords internal
+is_valid_wikibase_datatype <- function(x) {
+  valid_datatypes <- c(
+    "wikibase-item",
+    "wikibase-property",
+    "external-id",
+    "url",
+    "commonsMedia",
+    "string",
+    "monolingualtext",
+    "quantity",
+    "time",
+    "globe-coordinate",
+    "math",
+    "geo-shape",
+    "tabular-data",
+    "musical-notation",
+    "wikibase-lexeme",
+    "wikibase-form",
+    "wikibase-sense"
+  )
+
+  x <- as.character(x)
+  x %in% valid_datatypes
+}

R/validate_create_entity_args.R

@@ -20,7 +20,7 @@ validate_create_entity_args <- function(label,
     stop(validated_action, ": 'label' must be a non-empty character string.")
   }
 
-  if (is.na(language) || !is.character(language) || length(language) < 1 || any(nchar(language))==0 ) {
+  if (any(is.na(language)) || !any(is.character(language)) || length(language) < 1 || any(nchar(language))<0 ) {
     stop(validated_action, ": 'language' must be a non-empty character vector.")
   }
 
@@ -83,7 +83,7 @@ validate_copy_entity_args <- function(language,
     stop("validate_copy_entity_args(..., validated_action) : 'validated_action' must be a non-empty character string.")
   }
 
-  if (is.na(language) || !is.character(language) || length(language) < 1 || any(nchar(language))==0 ) {
+  if (any(is.na(language)) || !any(is.character(language)) || length(language) < 1 || any(nchar(language))<0 ) {
     stop(validated_action, ": 'language' must be a non-empty character vector.")
   }
 

_pkgdown.yml

@@ -39,6 +39,7 @@ reference:
     contents:
       - get_wikidata_item
       - get_property_definition
+      - get_claim
       - get_claims
       - left_join_column
   - title: "Writing"
@@ -49,6 +50,7 @@ reference:
      - create_property
      - add_statement
      - add_id_statement
+     - new_wikibase_session
   - title: "Copying"
     desc: >
      Copying from a Wikibase instance to another one. Currently only copying from

tests/testthat/test-copy_wikidata_property.R

@@ -11,6 +11,7 @@ test_that("copy_wikidata_property() fails when CSRF token is missing or invalid"
 test_that("copy_wikidata_property() fails when data curator is not a person", {
   expect_error(copy_wikidata_property(
     pid_on_wikidata = "P31",
+    wikibase_api_url = "https://reprexbase.eu/jekyll/api.php",
     csrf = NULL,
     data_curator = 123
   ), regexp = "must be a person")

tests/testthat/test-validate_create_entity_args.R

@@ -55,7 +55,7 @@ test_that("validate_create_entity_args(..., csrf)", {
 
 
 test_that("validate_copy_entity_args(..., validated_action)", {
-  expect_error(validate_copy_entity_args(language="en",
+  expect_error(validate_copy_entity_args(language=c("en", "hu", "nl"),
                                          "https://reprexbase.eu/jekyll/api.php",
                                          equivalence_property = "P11",
                                          equivalence_id =  "Q12",