From 2c54ca2f218d4128863aee73b796ad587bdbdf6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leila=20I=C3=B1igo=20de=20la=20Cruz?= <leilaicruz@gmail.com>
Date: Mon, 2 Jun 2025 12:06:31 +0200
Subject: [PATCH 1/3] update the djehuty template and cli

---
 .gitignore                             |  3 +
 src/fairly/cli/dataset.py              | 22 ++++++
 src/fairly/data/templates/djehuty.yaml | 98 ++++++++++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 src/fairly/data/templates/djehuty.yaml

diff --git a/.gitignore b/.gitignore
index e05c93c..9de4f35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,3 +139,6 @@ experiments
 tests/notes.py
 _no_*
 
+# python virtual environment
+
+/fairly/
\ No newline at end of file
diff --git a/src/fairly/cli/dataset.py b/src/fairly/cli/dataset.py
index 25b7146..556a5e5 100644
--- a/src/fairly/cli/dataset.py
+++ b/src/fairly/cli/dataset.py
@@ -1,4 +1,6 @@
 import typer
+from pathlib import Path
+import importlib.resources as pkg_resources
 
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
@@ -21,6 +23,26 @@ def create(
 
     fairly dataset create <path> --template <template>
     '''
+    # If the user did not explicitly pass --template (so template=="default"),
+    # check whether <path> matches a provider-specific YAML under data/templates.
+    if template == "default":
+        # take just the final name of the path (in case they passed "some/folder").
+        provider_name = Path(path).name
+        try:
+            # Try opening fairly/data/templates/<provider_name>.yaml
+            import importlib.resources as pkg_resources
+            tmpl_file = f"{provider_name}.yaml"
+            pkg_resources.open_text("fairly.data.templates", tmpl_file).close()
+            # If no exception, that file exists → use provider_name as template
+            template = provider_name
+        except FileNotFoundError:
+            # Did not find <path>.yaml under data/templates → stick with default.yaml
+            typer.echo(
+                f"Warning: template '{provider_name}' not found; using default.yaml",
+                err=True
+           )
+
+    # Finally, call the existing init_dataset() with whichever template we determined.
     fairly.init_dataset(path, template=template)
 
 
diff --git a/src/fairly/data/templates/djehuty.yaml b/src/fairly/data/templates/djehuty.yaml
new file mode 100644
index 0000000..5a6a590
--- /dev/null
+++ b/src/fairly/data/templates/djehuty.yaml
@@ -0,0 +1,98 @@
+metadata:
+
+  # Title of the dataset
+  title: ""
+  #   A short, human-readable title. For example:
+  #   title: "My coolest dataset ever"
+
+  # A detailed description of the dataset (purpose, scope, contents, file formats).
+  description: ""
+  #   e.g.
+  #   description: "A description covering the dataset’s purpose, scope, contents, and file formats."
+
+  # Keywords (list of strings) to tag this dataset.
+  keywords: []
+  #   Example:
+  #   keywords: ["nanofabrication","mechanical properties","nanocomposites"]
+
+  # Categories as controlled vocabulary.
+  # Replace these with actual UUIDs from /v2/categories (see categories.json).
+  categories: []
+  #   Example (two UUIDs + one numeric ID):
+  #   categories: ["c1b8cd5f-1fb7-4de9-9033-9c98e0f3a8ca","13659","60977a21-b79e-41d9-935a-04ecc6c09a57"]
+
+  # List of author records. Each author object can include fields like:
+  #   - first_name
+  #   - full_name
+  #   - last_name
+  #   - orcid_id
+  #   - email         (if you want to supply an email)
+  #   - affiliation   (if known)
+  authors: []
+  # List of authors to be associated with the dataset.
+  #   Example:
+  #   authors:
+  #     - { first_name: "John",  last_name: "Doe",  full_name: "John Doe",  orcid_id: "0000-0003-4324-5350" }
+  #     - { first_name: "Linda", last_name: "Pig",  full_name: "Linda Pig",  orcid_id: "0000-0003-4324-4230" }
+
+  # Defined type of the dataset. Options (controlled vocabulary) include:
+  #   figure, online resource, preprint, book, conference contribution,
+  #   media, dataset, poster, journal contribution, presentation, thesis, software, other
+  defined_type: "dataset"
+  #   You can leave it blank or change it to one of the allowed types:
+  #   defined_type: "dataset"
+
+  # One‐liner to cite your funding.
+  funding: ""
+  #   e.g.
+  #   funding: "Funded by the XYZ Grant"
+
+  # List of detailed funding records, if you want to break them out individually.
+  # Each record can have:
+  #   - title        (e.g. name of the grant)
+  #   - funder_name  (e.g. funding agency)
+  funding_list: []
+  #   Example:
+  #   funding_list:
+  #     - { title: "Magic Money Tree Fund", funder_name: "Open Tree" }
+  #     - { title: "Another Fund",            funder_name: "Another Tree" }
+
+  # License under which the dataset may be re-used.
+  # Must be an integer ID from /v2/licenses (see licenses.json), or you can leave blank
+  # if you want to pick it later:
+  license: 
+  #   Example:
+  #   license: 1
+
+  # ISO 639-1 language code for the dataset.
+  language: "en"
+  #   Example:
+  #   language: "en"
+
+  # DOI field; leave empty if you want Djehuty to assign a DOI automatically upon publication.
+  doi: ""
+  #   If you already have a DOI and want to register it manually, put it here.
+
+  # URL of the DOI for an associated peer‐reviewed journal publication (if any).
+  resource_doi: ""
+  #   e.g. 
+  #   resource_doi: "10.1000/j.journal.2023.01.001"
+
+  # Title of the associated peer‐reviewed journal publication.
+  resource_title: ""
+  #   e.g.
+  #   resource_title: "A Journal Paper That Uses This Data"
+
+  # Custom fields: list of arbitrary key‐value pairs for anything not covered above.
+  custom_fields_list: []
+  #   This is a list of objects, where each object has a 'name' and a 'value'.
+  #   Each entry is an object with:
+  #     - name:  (string key)
+  #     - value: (string or number or list)
+  #   Example:
+  #   custom_fields_list:
+  #     - { name: "contributors",  value: "John Doe, Linda Pig" }
+  #     - { name: "data_link",     value: "https://example.com/data_link" }
+  #     - { name: "publisher",     value: "4TU.ResearchData" }
+  #     - { name: "organizations", value: "Organization 1, Organization 2" }
+  #     - { name: "format",        value: ".csv, .txt" }

From ef92fe4463d6fd4400fd4d954ab3f1fcf16b8200 Mon Sep 17 00:00:00 2001
From: Leila Inigo de la Cruz <leilaicruz@gmail.com>
Date: Mon, 2 Jun 2025 12:17:43 +0200
Subject: [PATCH 2/3] remove import inline

---
 src/fairly/cli/dataset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fairly/cli/dataset.py b/src/fairly/cli/dataset.py
index 556a5e5..42831ba 100644
--- a/src/fairly/cli/dataset.py
+++ b/src/fairly/cli/dataset.py
@@ -2,6 +2,7 @@
 from pathlib import Path
 import importlib.resources as pkg_resources
 
+
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 import fairly
@@ -30,7 +31,6 @@ def create(
         provider_name = Path(path).name
         try:
             # Try opening fairly/data/templates/<provider_name>.yaml
-            import importlib.resources as pkg_resources
             tmpl_file = f"{provider_name}.yaml"
             pkg_resources.open_text("fairly.data.templates", tmpl_file).close()
             # If no exception, that file exists → use provider_name as template

From ad473176be7b4132d03f31ed96c86078acd24378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leila=20I=C3=B1igo=20de=20la=20Cruz?= <leilaicruz@gmail.com>
Date: Wed, 11 Jun 2025 08:37:56 +0200
Subject: [PATCH 3/3] cleaning up template

---
 src/fairly/data/templates/djehuty.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/fairly/data/templates/djehuty.yaml b/src/fairly/data/templates/djehuty.yaml
index 5a6a590..f5b87dc 100644
--- a/src/fairly/data/templates/djehuty.yaml
+++ b/src/fairly/data/templates/djehuty.yaml
@@ -38,10 +38,8 @@ metadata:
   # Defined type of the dataset. Options (controlled vocabulary) include:
   #   figure, online resource, preprint, book, conference contribution,
   #   media, dataset, poster, journal contribution, presentation, thesis, software, other
-  defined_type: "dataset"
-  #   You can leave it blank or change it to one of the allowed types:
-  #   defined_type: "dataset"
-
+  defined_type: ""
+ 
   # One‐liner to cite your funding.
   funding: ""
   #   e.g.