rheed_data/layer_N has now attr NXclass set to "NXsubentry"

now many of the instructions prev. under the __name__ = "__main__"
condition have their own function (now called main())

.env.example

@@ -0,0 +1,4 @@
+api_key=""
+elabid=""
+ELABFTW_API_URL="https://elabftw.fisica.unina.it/api/v2"
+operative_unit="cnr-spin.na"

.gitignore

@@ -1,6 +1,15 @@
-# ignora log di h5tojson e jsontoh5
+# ignores bkp files of drawio
+.$*.bkp
+
+# ignores logs of h5tojson, jsontoh5
 *.log
 
+# ignores any output of main.py
+output/*.json
+output/*.h5
+output/*.nxs
+output/attachments/*.*
+
 # ---> Python
 # Byte-compiled / optimized / DLL files
 __pycache__/

docs/user-manual_01.adoc

@@ -0,0 +1,53 @@
+== Introduction
+// TO-DO: Grammar-check. I'm totally fried right now and can't seem to complete even a single proper
+*{software-family}* - short for _**e**LabFTW to Ne**X**us **Pars**er_ - is (hopefully) a family of specialized parsing software applications, mainly developed in Python, whose primary job is to automatically transform experimental metadata and data - originally stored as JSON objects inside an electronic lab notebook - into standardized, self-descriptive **NeXus files**.
+
+The software is designed to fetch "scattered" data (often distributed across multiple linked entries) from our eLNfootnote:[Acronym for "_electronic Lab Notebook_".] of choice - link:{elabftw-site}[**eLabFTW**^] - where the data is originally stored as JSON objects. It then parses the included metadata to resolve the full dataset which is then used to create a dictionary following a pre-established schema (dependent on the analysis or fabrication method, e.g., PLD, XRD, or RHEED), and finally uses said dictionary to produce an **HDF5/NeXus file** which complies with the **FAIR Principles** and the guidelines given within the context of the Italian PNRRfootnote:pnrr[PNRR stands for _National Recovery and Resilience Plan_.] **NFFA-DI**.
+
+Specifically, *{software-name}* is designed for *Pulsed Laser Deposition / PLD* fabrications.
+
+=== NFFA-DI and FAIR Principles
+PNRR (_Piano Nazionale di Ripresa e Resilienza_) is Italy's national recovery plan from the aftermaths of COVID-19. +
+*NFFA-DI* (_Nano Foundries and Fine Analysis - Digital Infrastructure_) is a project within this plan aimed at creating a distributed digital infrastructure for nanoscience and nanotechnology. In practice, NFFA-DI provides a unified cyber-platform for researchers to access advanced instrumentation, simulation tools, and data management services across multiple Italian research centers.
+
+Like most modern scientific projects NFFA-DI is _FAIR by design_, meaning it strives for total compliance to *FAIR Principles*. FAIR is the acronym of the four main characteristics all compliant projects should share:
+
+> * Findable: «Metadata and data should be easy to find for both humans and computers.»
+> * Accessible: «Once the user finds the required data, she/he/they need to know how they can be accessed, possibly including authentication and authorisation.»
+> * Interoperable: «The data usually need to be integrated with other data. In addition, the data need to interoperate with applications or workflows for analysis, storage, and processing.»
+> * Reusable: «Metadata and data should be well-described so that they can be replicated and/or combined in different settings.»
+> 
+> Source: link:{go-fair-site}[GO FAIR^]
+
+
+{software-name} contributes to NFFA-DI goals by enabling automated data harmonization: converting local PLD experiment records into a common, shareable format (NeXus) with a mutually agreed upon schema, thereby making the data interoperable across the entire NFFA-DI ecosystem.
+
+TIP: More info on NFFA-DI at link:{nffa-di-site}[nffa-di.it^].
+
+=== eLabFTW
+*eLabFTW* is an open-source, web-based electronic laboratory notebook and resource manager. It acts as a central digital hub for one or more laboratories, organizing information (as database entries) into two main constructs:
+
+* **Experiments**: They are the core feature of eLabFTW, can contain structured data (via custom JSON fields), unstructured text, timestamps, tags, links to files (attachments), and relations to database items.
+* **Resources** or **Items**: This is a separate, structured inventory for items like raw materials (targets, substrates), instruments (UHV machines) or samples. Each entry is built from customizable templates with defined metadata (e.g. for a substrate batch we have name, manufacturer, geometry, available pieces left...).
+
+Although separated into different database constructs, experiments and items all have their own unique, incremental internal ID, which we'll simply call *elabid* to distinguish it from other identifiers, with no academic utility but extremely important when dealing with eLabFTW from a developer's perspective.
+
+// method-specific
+In a software like eLabFTW where data can (and will) be spread out through multiple entries, a particularly useful feature is **linking**: the software allows you to link experiments or items with each other, using elabid's as identifiers. For a PLD deposition, you can link the experiment describing a single layer to the target used, the substrate, the PLD instrument and the sample produced itself (all of which are eLabFTW items). This creates a complete provenance graph which can be (not-so) easily resolved starting from the sample's metadata and a chain of HTTP requests.
+
+In this optic, {software-name} interacts with eLabFTW via its REST API (Application Programming Interface). It reads a starting sample's ID (the entry point), fetches the relevant JSON metadata, chains requests using the elabid's of the sample's linked resources and experiments, rebuilds the entire dataset and if available downloads attached instrument files (e.g., RHEED intensities, images) to package all of it into the final NeXus file.
+
+=== The output: HDF5 and NeXus files
+The output of {software-family} is an **HDF5 (Hierarchical Data Format ver. 5) file**, which is a powerful file format designed to store and organize large volumes of numerical data. It acts like a virtual file system inside a single file, using a hierarchical group/dataset structures in the same way a file system uses folders and files - with both elements having their own metadata; this way the file is self-describing, containing all relevant information like a small database. HDF5 also supports efficient slicing, compression and parallel I/O. The file extension of such format is `.h5`.
+
+On the other hand, *NeXus* is a common data standard [.underline]#built on top of HDF5#. It defines fixed conventions for naming groups, datasets and attributes, specifically for neutron, X-ray, and now materials science experiments. NeXus provides "application definitions" (like _NXpld_fabrication_ for PLD) that specify exactly which fields must/may appear. NeXus is also heavily promoted by _FAIRmat_, a German-based consortium, part of the NFDI, whose main mission is providing scientists «with a FAIR data infrastructure and the skills and tool they need to make the most of it»footnote:[As stated on their link:{fairmat-site}[website^].]. The file extension of such format is `.nxs`, but generally file viewers treat the two formats similarly.
+
+Last but not least, NeXus is also the format of choice for data sharing in the NFFA-DI guidelines. Which brings us to the reason why {software-family} exists.
+
+[#reading-nxs]
+==== Reading HDF5/NeXus files
+While writing an HDF5/NeXus file usually requires dedicated software and/or a good knowledge of programming and familiarity with specific libraries (like h5py), there are multiple ways to read these files even without such knowledge.
+
+One of such ways would be using the online NeXus file viewer of the NCNR (_NIST Center for Neutron Research_), available on their link:{ncnr-viewer}[website^]. The "_Browse..._" button at the bottom allows for uploading both h5 and nxs files, although drag and drop also works.
+
+Another similar but in my opinion more elegant online file viewer is the one hosted by the HDF5 Group: link:{hdf5-viewer}[MyHDF5^]. Other than the more modern appearance this viewer doesn't upload files to any remote server, with every operation happening locally in your browser; the drag and drop works better meaning you won't accidentally reload the page if you miss the dropping area, and the viewer also allows for opening multiple concurrent files, and downloading h5 files from URL.

docs/user-manual_02.adoc

@@ -0,0 +1,171 @@
+== Using the software
+WARNING: This software requires Python 3.12 or later. +
+The module *venv* and the package manager *pip* are also required.
+
+=== Downloading the source code
+IMPORTANT: Currently ({revdate}) the source code is hosted on a private Gitea instance, owned by {author}. +
+If the site is down for maintenance or temporarily unavailable please contact the webmaster via mailto:{email}[e-mail].
+
+// TO-DO: add link to direct download of package
+The source code can be acquired directly via *git*, or downloaded from the official repository on link:{repo-url}[Gitea D'Amico^].
+
+[source,bash,subs="verbatim,attributes"]
+----
+git clone {repo-url}.git {software-name}
+cd {software-name} # enter directory
+ls
+  LICENSE    docs/     output/           src/
+  README.md  glossary  requirements.txt  tests/
+----
+
+Optionally, you can access the code in the development branch by executing:
+[source,bash]
+----
+git checkout dev
+----
+
+=== Preparing the environment
+Before starting {software-name} {revnumber} requires a total of 6 modules to be installed, which are listed link:{repo-url}/src/branch/main/requirements.txt[here^]. Since installing a Python module system-wide is almost never a good idea, start by creating and activating a virtual environment.
+
+In the software folder, run:
+
+[source,bash]
+----
+# Calls venv module to create new Python virtual environment in .venv:
+python3 -m venv .venv
+# If command is successful, running ls should show a new .venv folder:
+ls -d .*
+  .venv
+# Activate venv:
+source .venv/bin/activate
+----
+
+.Most shells like Bash show very clearly when you're working inside a virtual environment.
+[#usage-venv]
+image::usage-venv.png[]
+
+At this point you're free to install the requirements through *pip*:
+[source,bash]
+----
+# Install from list in requirements.txt:
+pip install -r requirements.txt
+----
+
+Most of the warnings displayed by pip are safe and generally it's not dangerous to ignore them. +
+Unless pip exits abruptly returning an error, you environment is ready to work.
+
+=== Configuration through .env file
+// foggetaboutit
+Much like the previous step, configuring the software with your settings (API key, eLabFTW URL...) is something you do _una tantum_ and then usually forget about it.
+
+Inside the {software-name} folder there's a file called `.env.example`. Rename it removing ".example", then open it with your editor of choice. This is your *.env* (or *dotenv*) file.
+
+[source,bash]
+----
+mv .env.example .env
+vim .env
+# The file presents itself like this:
+ 1 | api_key=""
+ 2 | elabid=""
+ 3 | ELABFTW_API_URL="https://elabftw.fisica.unina.it/api/v2"
+ 4 | operative_unit="cnr-spin.na"
+----
+
+* *api_key* is your own personal eLabFTW API key. Generating one is an easy task explained in full detail below.
+* *elabid* is the elabid of the resource you'd like to select (your starting sample); this field can (and probably should) be left blank - in which case the application prompts you for an elabid on runtime, and your answer will not be stored meaning you can easily rerun the program with a different target.
+* *ELABFTW_API_URL* is the URL of your eLabFTW instance; if you're running this from the laboratories in Monte S. Angelo, Naples, you're probably leaving this field as it is.
+* *operative_unit* is the operative unit you ran your experiments from. It's only needed to compose the filename of the NeXus, which can be easily modified anytime later, and it's not necessary for creating the file itself.
+
+None of these fields are required, meaning you can technically skip this entire section. If any of the first three keys are blank or missing you will be prompted to provide the necessary info at runtime, and your answers will not be memorized - meaning e.g. you will have to provide your API key every time you run the program.
+
+NOTE: Do [.underline]#NOT# confuse .env with .venv: the first is a [.underline]#file# containing all the environmental variables you need to run {software-name} properly, the latter is a [.underline]#directory# containing your virtual environment with all the required modules.
+
+==== Generating an eLabFTW API key
+eLabFTW has its own link:{elabftw-apikey-docs}[API documentation^] on which you can rely. A new API key can be generated in the Settings → API Keys page by giving it a name and an access level:
+
+.Screenshot from our eLabFTW. The key must have a name and permissions. Naturally, the key you see here in clear has been invalidated.
+[#api-gen]
+image::usage-apigen.png[align=center,width=75%]
+
+The *name* of the key is a descriptor for you to remember why you created it in the first place - something like "parser_key01". The *permissions* can either be "_Read/Write_" or "_Read-Only_": in the first scenario the key may also be used to edit or create entries you own on eLabFTW, while read-only key only allow GET requests. {software-name} doesn't require writing permissions, so both options will do.
+
+[WARNING]
+.A few warnings.
+====
+* The key eLabFTW generates is [.underline]#only shown once#, then stored encrypted in the database. This means that after closing or refreshing the page the key [.underline]#is lost forever# if not saved on an external support. Which brings us to the second warning.
+* Store and protect your API key like you would your password, as [.underline]#it gives full/limited access to your account# exactly like your password, but without the protection given by 2FA/MFA. For this purpose there are many offline (like link:{keepass-site}[KeePass^]) or online (like link:{bitwarden-site}[BitWarden^]) **password managers**.
+* Your .env file is [.underline]#NOT# a safe place to _store_ your API key. Once pasted there be very careful who you share your files with, and be careful not to expose your key when sending your NeXus files to other computers. If you don't trust your awareness leave the api_key field blank and just paste your API key in the terminal every time you run {software-name}.
+====
+
+=== Running the program
+Open a terminal into the project folder. Before attempting to run the program:
+
+* Make sure your virtual environment is active, or if it isn't run: +
+`source .venv/bin/activate`
+* Make sure the required modules are installed, or if they aren't run:
+`pip install -r requirements.txt`
+* Make sure your .env file is properly set, or if it isn't make sure you know how to paste into the terminal the API key, the elabid of the required source and the URL of your eLabFTW instance (ending in `/api/v2`).
+
+When you're ready, run:
+[source,bash]
+====
+python3 src/main.py
+====
+
+If your .env file is completely filled out with valid values the only output you may read on the terminal are warnings or worst-case-scenario errors. Next chapter will cover all such cases. If your .env file lacks one or more values you will be asked to input the missing info at runtime.
+
+==== Entering missing values if prompted
+If you decide to run without a valid .env file (again, worst-case-scenario) you will be prompted to enter the required information directly into the terminal.
+
+.The difference between running {software-name} with no .env, and with a properly filled out .env. Same parameters, same output.
+[#usage-difference-dotenv]
+image::usage-difference-dotenv.png[]
+
+First and foremost you will be prompted for a valid API key. To paste your key in the terminal either right-click (_PowerShell_ and other terminal emulators), right-click > _Paste_, Ctrl + Shift + V (on most terminal emulators) or middle-click (Linux).
+
+Then you will be prompted for an elabid - which is a positive integer number. You can find your sample's elabid on eLabFTW, above the sample's name and before the sample's label and status. See xref:usage-elabid[xrefstyle="short"].
+
+Last but not least you will be prompted for a valid eLabFTW API endpoint URL. Such URL is composed by the base URL of your eLabFTW instance, closing with `/api/v2`. For instance: _++https://elabftw.fisica.unina.it/api/v2++_. +
+{software-name} {revnumber} will not validate such URL or return some very specific error.
+
+WARNING: Make sure the URL you paste doesn't end with a trailing slash. +
+++https://elabftw.fisica.unina.it/api/v2++ ✓ +
+++https://elabftw.fisica.unina.it/api/v2/++ ✗
+
+You won't be prompted for the operative unit, so that will require either setting up a .env or manually editing your NeXus files' names. The list of officially approved acronyms for the operative units can be consulted on NFFA-DI's link:{nffa-di-uo-acronyms}[official website^].
+
+.Where to find the elabid of a sample.
+[#usage-elabid]
+image::usage-elabid.png[]
+
+==== Retrieving and verifying your file
+By default the NeXus file will be saved in the `output/` folder. Currently ({revdate}) the software will also save a JSON dictionary with the full chain of all metadata collected on the sample. There is also an `attachments/` folder containing all the attachments downloaded during execution, which will be removed later on.
+
+The file will be recognizable by its name, which should already be in compliance with the following NFFA-DI naming guidelines:
+
+> «Each file generated in the context of a Proposal stored on OFED must use the following naming convention: ++nffa-di_[proposal_id]_[UO]_[UO_internal_id]++» - where _proposal_id_ is the approved ID of the research proposal, _UO_ is the link:{nffa-di-uo-acronyms}[official code^] of the operative unit, and «_UO_internal_id_ is a combination of the technique/instrument acronym and an Experiment ID freely decided». +
+> «Each file generated in the context of an In-house Research Project stored on OFED must use the following naming convention: nffa-di_[UO]_[project_id]_key, where the first part of the name adheres to the name of the bucket, while key is arbitrary.»
+>
+> Source: link:{nffa-di-rdp}[NFFA-DI Research Data Policy^]
+
+This means that the accepted filename for a NeXus file of a PLD, where proposal_id is _EXMPL01_, the operative unit is CNR-SPIN Naples and the sample's internal ID is _Na-26-012_ the filename will be:
+
+image::usage-name.png[]
+
+A NeXus file can be verified through one of the readers listed in xref:reading-nxs[xrefstyle="short"]. Pay attention to the following aspects:
+
+* Do I visualize the file correctly?
+* Does the file respect the fabrication method's schema?
+* Is every required field present? Do I read the same values on eLabFTW and in the NeXus file? Are the units of measurement present?
+* Can I visualize heatmaps and N-axis graphs correctly?
+
+If the answer to all previous questions is "Yes", then the output file is NFFA-DI compliant.
+
+////
+collect nxs file
+filename is: [paste link of guidelines here]
+output folder is: output/
+attachments will be in: output/attachments - to be removed
+???
+profit
+////

docs/user-manual_03.adoc

@@ -0,0 +1,3 @@
+== Troubleshooting
+
+WIP

docs/user-manual_main.adoc

@@ -0,0 +1,41 @@
+= {software-name} User Manual: eLabFTW to NeXus Parser for PLD Fabrications 
+:author: Emanuele D'Amico
+:description: eLabFTW to NeXus Parser for PLD Fabrications
+:doctype: book
+:email: emanuele+expars@damico.ing
+:imagesdir: images
+:keywords: nffa-di, elabftw, nexus, parser, data science, mdmc, naples, cnr-spin, cnr, spin institute, python, hdf5, cli
+:revdate: 2026-05-14
+:revnumber: v0.2.1
+:revremark: alpha untested
+:stem: latexmath
+:toc:
+// custom attributes
+:disclamer: I'm in no position to give anyone coding/development/programming/testing tips. The only tips I can give you are based on my personal knowledge of this specific project.
+:software-family: eXPars
+:software-name: {software-family}-PLD
+:repo-url: https://gitea.damico.ing/emanuele/eXParser-PLD
+:repo-ssh: ssh://git@gitea.damico.ing/emanuele/eXParser-PLD.git
+:elabftw-apikey-docs: https://doc.elabftw.net/docs/usage/api/#generating-a-key
+:elabftw-site: https://elabftw.net
+:nffa-di-site: https://nffa-di.it/en/about-us/project/
+:nffa-di-rdp: https://nffa-di.it/it/research-data-policy/#3.1
+:nffa-di-uo-acronyms: https://nffa-di.it/en/uo-acronyms-for-data-infrastructure-naming-convention
+:go-fair-site: https://www.go-fair.org/fair-principles/
+:fairmat-site: https://www.fairmat-nfdi.eu/fairmat/about-fairmat/consortium-fairmat#mission
+:keepass-site: https://keepassxc.org/
+:bitwarden-site: https://bitwarden.com/
+:ncnr-viewer: https://ncnr.nist.gov/ncnrdata/view/nexus-hdf-viewer.html
+:hdf5-viewer: https://myhdf5.hdfgroup.org/
+
+include::user-manual_01.adoc[]
+
+include::user-manual_02.adoc[]
+
+//include::user-manual_03.adoc[]
+
+///////////////////////////////////////////////////////////////////////////
+// Look out for "method-specific" comments I've left before sections
+// containing information about one method in particulare (e.g. PLD fab.)
+// because that needs to be edited when writing the user manuals of other
+// eXParser's

requirements.txt

@@ -1,2 +1,6 @@
 requests
 asyncio
+h5py
+pillow
+elabapi_python
+dotenv

src/APIHandler.py

@@ -1,41 +1,169 @@
-import requests
+import os, requests
+from dotenv import load_dotenv
+from getpass import getpass
+import elabapi_python as elabapi
+
 
 class APIHandler:
-    '''
+    """
-    Class to standardize the format of the headers of our http requests.
+    Class which handles all interactions with the eLabFTW API.
-    '''
+    It provides methods to retrieve data from the API and download attachments.
+    It relies minimally on the elabapi-python library, which is used only for downloading attachments
+    (since the API doesn't support downloading attachments AFAIK).
+
+    Args:
+        api_key: str:           A valid API key for the eLabFTW instance where the data is stored, with permissions to access the relevant entries.
+                                eLabFTW's API keys are well documented here: https://doc.elabftw.net/docs/usage/api/.
+                                If you don't have an API key and are uncapable of creating one, contact your eLabFTW administrator.
+                                Or RTFM and create one yourself, it's not that hard.
+        ELABFTW_API_URL: str:   Complete URL of the eLabFTW instance's root for the API endpoints.
+                                In full caps because it won't (shouldn't) be changed much.
+    """
+
     # TO-DO: remove static url.
-    def __init__(self, apikey="", ELABFTW_API_URL="https://elabftw.fisica.unina.it/api/v2"):
+    def __init__(self, api_key="", ELABFTW_API_URL=None):
-        '''Init method, apikey suggested but not required (empty by default).'''
+        """Init method, api_key suggested but not required (empty by default)."""
-        self.auth = {"Authorization" : apikey}
+        # if not ELABFTW_API_URL:
-        self.content = {"Content-Type" : "application/json"}
+        #    load_dotenv()
+        #    ELABFTW_API_URL = os.getenv("ELABFTW_API_URL") or input(
+        #        "Enter a valid eLabFTW API URL (ends with '/api/v2)': "
+        #    )
+        self.api_key = api_key
+        self.auth = {"Authorization": api_key}
+        self.content = {"Content-Type": "application/json"}
         self.header = {**self.auth, **self.content}
         self.elaburl = ELABFTW_API_URL
-    def get_entry_from_elabid(self, elabid, entryType="items"):
-        '''
-        Method which returns a resource's raw data (as dictionary) from its elabid and entry type.
 
-        Entry type can be either "experiments" or "items".
+    def get_entry_from_elabid(self, elabid, entryType="items"):
-        '''
+        """
-        # TO-DO: validation and error handling on entryType value.
+        Returns raw data (as dictionary) from its elabid and entry type.
+
+        Args:
+            elabid: int:     elabftw internal id of the selected resource.
+            entryType: str:  Resource type. Anything other than "experiments" or "items" WILL raise an error.
+        """
+        if entryType not in ["experiments", "items"]:
+            raise Exception(
+                "You can only download attachments from experiments or items."
+            )
+
         header = self.header
         response = requests.get(
-            headers = header,
+            headers=header, url=f"{self.elaburl}/{entryType}/{elabid}", verify=True
-            url = f"{self.elaburl}/{entryType}/{elabid}",
-            verify=True
         )
-        if response.status_code // 100 in [1,2,3]:
+
-            entry_data = response.json()
+        # Response is 5xx = server error:
-            return entry_data
+        if response.status_code // 100 == 5:
-        elif response.status_code // 100 == 4:
+            raise ConnectionError(
+                f"There's a problem on the server. Status code: {response.status_code}."
+            )
+
+        # Response is 4xx = client error:
+        if response.status_code // 100 == 4:
             match response.status_code:
-                case 401|403:
+                case 401 | 403:
-                    raise ConnectionError(f"Invalid API key or authentication method.")
+                    # Forbidden or unauthorized:
+                    raise ConnectionError(
+                        f"Invalid API key, authentication method or elabid. Check if an item with ID = {elabid} actually exists."
+                    )
                 case 404:
-                    raise ConnectionError(f"404: Not Found. This means there's no resource with this elabid (wrong elabid?) on your eLabFTW (wrong endpoint?).")
+                    # Lapalissian:
+                    raise ConnectionError(
+                        "404: Not Found. This means there's no resource with this elabid (wrong elabid?) on your eLabFTW (wrong endpoint?)."
+                    )
                 case 400:
-                    raise ConnectionError(f"400: Bad Request. This means the API endpoint you tried to reach is invalid. Did you tamper with the source code? If not, contact the developer.")
+                    # I genuinely have no idea:
+                    raise ConnectionError(
+                        "400: Bad Request. This means the API endpoint you tried to reach is invalid. Did you tamper with the source code? If not, contact the developer."
+                    )
                 case _:
-                    raise ConnectionError(f"HTTP request failed with status code: {response.status_code} (NOTE: 4xx means user's fault).")
+                    # For some fucking reason, this is the only error I actually get from the API...
-        else:
+                    raise ConnectionError(
-            raise ConnectionError(f"There's a problem on the server. Status code: {response.status_code}.")
+                        f"HTTP request failed with status code: {response.status_code} (NOTE: 4xx means user's fault)."
+                    )
+
+        entry_data = response.json()
+        return entry_data
+
+    def download_attachment_data(self, elabid, upload_id, entryType="experiments"):
+        """
+        Downloads a specific attachment of a certain eLabFTW experiment (default) or item.
+        Only returns its binary data. Use method download_attachment_to_disk to save to file.
+
+        NOTE: Output is a dictionary where:
+            * The key is the attachment's filename;
+            * The value is the attachment's binary data.
+
+        Args:
+            elabid: int:     eLabFTW internal ID of the selected resource.
+            upload_id: int:  eLabFTW internal ID of the selected upload.
+            entryType: str:  Resource type. Anything other than "experiments" or "items" WILL raise an error.
+        """
+        if entryType not in ["experiments", "items"]:
+            raise Exception(
+                "You can only download attachments from experiments or items."
+            )
+
+        config = elabapi.Configuration()
+        config.api_key["api_key"] = self.api_key
+        config.api_key_prefix["api_key"] = "Authorization"
+        config.host = self.elaburl
+        config.debug = False
+        api_client = elabapi.ApiClient(config)
+        api_client.set_default_header(
+            header_name="Authorization", header_value=self.api_key
+        )
+        uploads_api = elabapi.UploadsApi(api_client)
+
+        # Scans through the attachments and selects the one with corresponing ID.
+        attachment = {
+            upload.real_name: uploads_api.read_upload(
+                entryType, elabid, upload_id, format="binary", _preload_content=False
+            ).data
+            for upload in uploads_api.read_uploads(entryType, elabid)
+            if upload.id == upload_id
+        }
+
+        return attachment
+
+    def download_attachment_to_disk(
+        self,
+        elabid,
+        upload_id,
+        entryType="experiments",
+        dump_dir="output/attachments",
+        # persistent=True,
+    ):
+        """
+        Downloads a specific attachment of a certain eLabFTW experiment (default) or item.
+        Downloads their binary data through method download_attachments_data and dumps it to dump_dir.
+        Returns full path of the output file.
+
+        Args:
+            elabid: int:        eLabFTW internal ID of the selected resource.
+            upload_id: int:     eLabFTW internal ID of the selected upload.
+            entryType: str:     Resource type. Anything other than "experiments" or "items" WILL raise an error.
+            dump_dir: str:      Directory to which to save the attachments. Default is "output/attachments".
+            persistent: bool:   [Unused] Decides if the files will stay on disk after all operations are completed.
+                                If set to False, deletes the file upon exiting. Default = True.
+        """
+
+        if entryType not in ["experiments", "items"]:
+            raise Exception(
+                "You can only download attachments from experiments or items."
+            )
+
+        uploads = self.download_attachment_data(elabid, upload_id, entryType=entryType)
+        for file in uploads:
+            raw_data = uploads[file]
+            full_path = os.path.join(dump_dir, f"exp{elabid}-{file}")
+            with open(full_path, "wb") as f:
+                f.write(raw_data)
+        return full_path
+
+
+# Testing methods
+if __name__ == "__main__":
+    api_key = getpass("Paste API key here [no echo]: ")
+    handler = APIHandler(api_key=api_key)
+    handler.download_attachment_to_disk(elabid=58, upload_id=81)

src/classes.py

@@ -1,8 +1,10 @@
 import os, json, requests
+from getpass import getpass
 from APIHandler import APIHandler
 
+
 class Layer:
-    '''
+    """
     Layer(layer_data) - where layer_data is a Python dictionary.
 
     Meant to be used for eLabFTW Experiments of the "PLD Deposition" category.
@@ -10,22 +12,33 @@ class Layer:
     eLabFTW experiments contain most of the data required by the NeXus file - although every layer is on a different eLab entry;
     unfortunately, some data like the target's chemical formula must be retrieved through additional HTTP requests.
     Attributes 'target_elabid', 'rheed_system_elabid' and 'laser_system_elabid' contain elabid's for these resources, which are all items.
-    '''
+    """
+
     def __init__(self, layer_data):
+        """
+        Properties/Attributes:
+            Too many to list.
+        """
         try:
+            self.elabid = layer_data["id"]
+            self.operator = layer_data["fullname"]
             self.extra = layer_data["metadata_decoded"]["extra_fields"]
-            self.layer_number = self.extra["Layer Progressive Number"]["value"] # integer
+            self.uploads = layer_data["uploads"]  # dict
-            self.target_elabid = self.extra["Target"]["value"] # elabid
+            self.layer_number = self.extra["Layer Progressive Number"][
-            self.laser_system_elabid = self.extra["Laser System"]["value"] # elabid
+                "value"
-            self.chamber_elabid = self.extra["Chamber"]["value"] # elabid
+            ]  # integer
-            self.rheed_system_elabid = self.extra["RHEED System"]["value"] # elabid
+            self.target_elabid = self.extra["Target"]["value"]  # elabid
-            self.start_time = layer_data.get("created_at")
+            self.laser_system_elabid = self.extra["Laser System"]["value"]  # elabid
-            self.operator = layer_data.get("fullname")
+            self.chamber_elabid = self.extra["Chamber"]["value"]  # elabid
-            self.description = layer_data.get("body")
+            self.rheed_system_elabid = self.extra["RHEED System"]["value"]  # elabid
             self.deposition_time = self.extra["Duration"]["value"]
+            self.deposition_time_unit = self.extra["Duration"]["unit"]
             self.repetition_rate = self.extra["Repetition rate"]["value"]
+            self.repetition_rate_unit = self.extra["Repetition rate"]["unit"]
             try:
-                self.number_of_pulses = (float(self.deposition_time) * float(self.repetition_rate)).__floor__()
+                self.number_of_pulses = (
+                    float(self.deposition_time) * float(self.repetition_rate)
+                ).__floor__()
             except ValueError:
                 # Since number_of_pulses is required, if it can't be calculated raise error:
                 raise ValueError("""
@@ -33,16 +46,33 @@ class Layer:
     This has to be an error, since these fields are required by the NeXus standard.
     Please edit your eLabFTW entry and retry.
                 """)
-            self.temperature = self.extra["Heater temperature"]["value"] # Note: this field used to have a trailing space in its name
+            self.temperature = self.extra["Heater temperature"][
-            self.process_pressure = self.extra["Process pressure"]["value"] # Note: this field used to have a trailing space in its name
+                "value"
+            ]  # Note: this field used to have a trailing space in its name
+            self.temperature_unit = self.extra["Heater temperature"]["unit"]
+            self.process_pressure = self.extra["Process pressure"][
+                "value"
+            ]  # Note: this field used to have a trailing space in its name
+            self.process_pressure_unit = self.extra["Process pressure"]["unit"]
             self.heating_method = self.extra["Heating Method"]["value"]
             self.layer_thickness = self.extra["Thickness"]["value"]
+            self.layer_thickness_unit = self.extra["Thickness"]["unit"]
             self.buffer_gas = self.extra["Buffer gas"]["value"]
             self.heater_target_distance = self.extra["Heater-target distance"]["value"]
-            self.laser_fluence = self.extra["Laser Intensity"]["value"] # here fluence = intensity
+            self.heater_target_distance_unit = self.extra["Heater-target distance"][
+                "unit"
+            ]
+            self.laser_fluence = self.extra["Laser Intensity"][
+                "value"
+            ]  # here fluence = intensity
+            self.laser_fluence_unit = "J/(s cm^2)"
             self.laser_spot_area = self.extra["Spot Area"]["value"]
+            self.laser_spot_area_unit = "mm^2"
             try:
-                self.laser_energy = (float(self.laser_fluence) * float(self.laser_spot_area)).__round__(3)
+                self.laser_energy = (
+                    float(self.laser_fluence) * float(self.laser_spot_area) / 100
+                ).__round__(3)
+                self.laser_energy_unit = "J/s"
             except ValueError:
                 # Since laser_energy is NOT required, if it can't be calculated warn user but allow the software to continue execution:
                 print("""
@@ -51,31 +81,85 @@ class Layer:
     Setting Laser Energy to NoneType.
                 """)
                 # Placeholder
-                self.laser_energy = None
+                self.laser_energy = "N/A"
+                self.laser_energy_unit = "J/s"
             # Laser rasternig section
-            self.laser_rastering_geometry = self.extra["Laser Rastering Geometry"]["value"]
+            self.laser_rastering_geometry = self.extra["Laser Rastering Geometry"][
-            self.laser_rastering_positions = self.extra["Laser Rastering Position"]["value"]
+                "value"
-            self.laser_rastering_velocities = self.extra["Laser Rastering Speed"]["value"]
+            ]
+            self.laser_rastering_positions = self.extra["Laser Rastering Position"][
+                "value"
+            ]
+            self.laser_rastering_velocities = self.extra["Laser Rastering Speed"][
+                "value"
+            ]
             # Pre annealing section
             self.pre_annealing_ambient_gas = self.extra["Buffer gas Pre"]["value"]
             self.pre_annealing_pressure = self.extra["Process pressure Pre"]["value"]
-            self.pre_annealing_temperature = self.extra["Heater temperature Pre"]["value"]
+            self.pre_annealing_temperature = self.extra["Heater temperature Pre"][
+                "value"
+            ]
             self.pre_annealing_duration = self.extra["Duration Pre"]["value"]
+            self.pre_annealing_pressure_unit = self.extra["Process pressure Pre"][
+                "unit"
+            ]
+            self.pre_annealing_temperature_unit = self.extra["Heater temperature Pre"][
+                "unit"
+            ]
+            self.pre_annealing_duration_unit = self.extra["Duration Pre"]["unit"]
             # Post annealing section
             self.post_annealing_ambient_gas = self.extra["Buffer gas PA"]["value"]
             self.post_annealing_pressure = self.extra["Process pressure PA"]["value"]
-            self.post_annealing_temperature = self.extra["Heater temperature PA"]["value"]
+            self.post_annealing_temperature = self.extra["Heater temperature PA"][
+                "value"
+            ]
             self.post_annealing_duration = self.extra["Duration PA"]["value"]
+            self.post_annealing_pressure_unit = self.extra["Process pressure PA"][
+                "unit"
+            ]
+            self.post_annealing_temperature_unit = self.extra["Heater temperature PA"][
+                "unit"
+            ]
+            self.post_annealing_duration_unit = self.extra["Duration PA"]["unit"]
+
             # Rejected but suggested by the NeXus standard:
-            #self.laser_rastering_coefficients = None
+            # self.laser_rastering_coefficients = None
         except KeyError as k:
             # Some keys are not required and can be called through the .get() method - which is permissive and allows null values;
             # Other keys are required so if they can't be called (invalid or null) raise error and stop execution of the program:
-            raise KeyError(f"The provided dictionary lacks a \"{k}\" key. Check the deposition layer entry on eLabFTW and make sure you used the correct Experiment template.")
+            raise KeyError(
-    def get_instruments(self, apikey):
+                f'The provided dictionary lacks a "{k}" key. Check the deposition layer entry on eLabFTW and make sure you used the correct Experiment template.'
-        raw_lasersys_data = APIHandler(apikey).get_entry_from_elabid(self.laser_system_elabid, entryType="items")
+            )
-        raw_chamber_data = APIHandler(apikey).get_entry_from_elabid(self.chamber_elabid, entryType="items")
+        # Optional
-        raw_rheedsys_data = APIHandler(apikey).get_entry_from_elabid(self.rheed_system_elabid, entryType="items")
+        self.start_time = layer_data.get("created_at") or None
+        self.description = layer_data.get("body") or None
+
+    def get_instruments(self, api_key, ELABFTW_API_URL):
+        """
+        Retruns a dictionary of all the instruments used to create the layer.
+        The format of the dictionary is:
+            {
+                "laser_system": str,
+                "deposition_chamber": str,
+                "rheed_system": str
+            }
+
+        Args:
+            api_key: str:           A valid API key for the eLabFTW instance where the data is stored, with permissions to access the relevant entries.
+                                    eLabFTW's API keys are well documented here: https://doc.elabftw.net/docs/usage/api/.
+                                    If you don't have an API key and are uncapable of creating one, contact your eLabFTW administrator.
+                                    Or RTFM and create one yourself, it's not that hard.
+            ELABFTW_API_URL: str:   URL for the API root endpoint of the eLabFTW instance. Ends with '/api/v2' - no trailing slash.
+        """
+        raw_lasersys_data = APIHandler(api_key, ELABFTW_API_URL).get_entry_from_elabid(
+            self.laser_system_elabid, entryType="items"
+        )
+        raw_chamber_data = APIHandler(api_key, ELABFTW_API_URL).get_entry_from_elabid(
+            self.chamber_elabid, entryType="items"
+        )
+        raw_rheedsys_data = APIHandler(api_key, ELABFTW_API_URL).get_entry_from_elabid(
+            self.rheed_system_elabid, entryType="items"
+        )
         instruments_used = {
             "laser_system": raw_lasersys_data.get("title") or None,
             "deposition_chamber": raw_chamber_data.get("title") or None,
@@ -83,31 +167,108 @@ class Layer:
         }
         return instruments_used
 
+    def list_attachments(self):
+        """
+        Returns a dictionary of all the attachments linked to the layer, where:
+            * Each key is the attachment's progressive ID (0, 1...);
+            * Each value is a dictionary containing the attachment's elabid, filename, hashname and related experiment elabid (= self.elabid).
+
+        Data is already in layer_data, so the API key is unrequired. Same goes for:
+            * fetch_textual_uploads() - no arguments;
+            * fetch_images() - no arguments.
+
+        Exception: returns {} (empty dictionary) if no uploads/attachments on Layer.
+        """
+        # Remember: Layers are experiments, so we only need to look for attachments in the experiment endpoint.
+        if self.uploads == []:
+            return {}
+        attachments = {
+            self.uploads.index(attachment): {
+                "id": attachment["id"],
+                "filename": attachment["real_name"],
+                "hashname": attachment["long_name"],
+                "related_experiment": attachment["item_id"],
+            }
+            for attachment in self.uploads
+        }
+        return attachments
+
+    def fetch_textual_uploads(self):
+        """
+        Starting from the list of attachments, filters out and returns a list of the textual uploads linked to the layer, which can be either plain text, csv, tsv etc.
+        Returns only their names, so that the user may select which one to import into the NeXus file as a dataset.
+
+        It only looks for .txt, .csv and .tsv files, although it could be easily modified to include other formats.
+        It is also file extension-sensitive, so anything not ending with .txt, .csv or .tsv won't be retrieved.
+        That's because the API (v5.3.11) doesn't provide MIME Type or similar metadata on the attachments, so the only way to know if an attachment is an image or not is through its filename.
+        """
+        attachments = self.list_attachments()
+        textual_uploads = {
+            attachment: attachments[attachment]
+            for attachment in attachments
+            if attachments[attachment]["filename"][-4:] in (".txt", ".csv", ".tsv")
+        }
+        return textual_uploads
+
+    def fetch_images(self):
+        """
+        Starting from the list of attachments, filters out and returns a Starting from the list of attachments, filters out and returns a list of all the (PNG or BMP) images attached to the layer.
+        Hopefully one of them is a RHEED pattern.
+        Returns only their names, so that the user may select which one to import into the NeXus file as a RHEED acquisition.
+
+        It only looks for .png and .bmp files, although it could be easily modified to include other formats.
+        It is also file extension-sensitive, so anything not ending with .png or .bmp won't be retrieved, even if it's an actual image.
+        That's because the API (v5.3.11) doesn't provide MIME Type or similar metadata on the attachments, so the only way to know if an attachment is an image or not is through its filename.
+        """
+        attachments = self.list_attachments()
+        images = {
+            attachment: attachments[attachment]
+            for attachment in attachments
+            if attachments[attachment]["filename"][-4:] in (".png", ".bmp")
+        }
+        return images
+
+
 class Entrypoint:
-    '''
+    """
     Entrypoint(sample_data) - where sample_data is a Python dictionary.
 
     Meant to be used for eLabFTW Resources of the "Sample" category.
 
     The entrypoint is the starting point of the process of resolving the data chain.
     The entrypoint must be a dictionary containing the data of a sample, created directly from the JSON of the item endpoint on eLabFTW - which can be done through the function get_entry_from_elabid.
-    '''
+    """
+
     def __init__(self, sample_data):
+        """
+        Properties/Attributes:
+            * name: str:                        Name of the sample. Fairly important, and always present unless someone screws up REALLY bad.
+            * linked_items: dict:               Dictionary generated by eLabFTW containing metadata on the items linked to the entrypoint.
+            * batch_elabid: int:                eLabFTW internal id of the batch of the substrate used as the foundation of the sample.
+            * proposal: int:                    eLabFTW internal id of the proposal linked to the sample.
+            * linked_experiments: dict:         Dictionary generated by eLabFTW containing metadata on the experiments linked to the entrypoint.
+            * linked_experiments_elabid: list:  List of eLabFTW internal id's of the experiments linked to the entrypoint.
+        """
         try:
+            self.name = sample_data["title"]
             self.extra = sample_data["metadata_decoded"]["extra_fields"]
-            self.linked_items = sample_data["items_links"] # dict
+            self.linked_items = sample_data["items_links"]  # dict
-            self.batch_elabid = self.extra["Substrate batch"]["value"] # elabid
+            self.batch_elabid = self.extra["Substrate batch"]["value"]  # elabid
-            self.linked_experiments = sample_data["related_experiments_links"] # dict
+            self.proposal = self.extra["Proposal"].get("value") or None  # proposal
-            self.linked_experiments_elabid = [ i["entityid"] for i in self.linked_experiments ] # list of elabid
+            self.linked_experiments = sample_data["related_experiments_links"]  # dict
+            self.linked_experiments_elabid = [
+                i["entityid"] for i in self.linked_experiments
+            ]  # list of elabid
         except KeyError as k:
             # Some keys are not required and can be called through the .get() method - which is permissive and allows null values;
             # Other keys are required so if they can't be called (invalid or null) raise error and stop execution of the program:
-            raise KeyError(f"The provided dictionary lacks a \"{k}\" key. Check the sample entry on eLabFTW and make sure you used the correct Resource template.")
+            raise KeyError(
-        # Non-required attributes:
+                f'The provided dictionary lacks a "{k}" key. Check the sample entry on eLabFTW and make sure you used the correct Resource template.'
-        self.name = sample_data.get("title") or None # error prevention is more important than preventing empty fields here
+            )
+
 
 class Material:
-    '''
+    """
     Material(material_data) - where material_data is a Python dictionary.
 
     Meant to be used for eLabFTW Resources of either the "PLD Target" or the "Substrate" categories.
@@ -116,64 +277,199 @@ class Material:
         * Name and formula;
         * Shape and dimensions;
         * Misc.
-    '''
+    """
+
     def __init__(self, material_data):
+        """
+        Properties/Attributes:
+            * name: str:            Name of the material.
+            * compound_elabid: int: eLabFTW internal id of the compound.
+            * dimensions: str:      Dimensions of the material, in standard format.
+                                    The class recognizes the unit of measurement and acts consequently.
+            * dimensions_unit: str: Unit of measurement - either "mm x mm", "inches" or None.
+        """
         try:
-            self.name = material_data["title"] # required
+            self.name = material_data["title"]  # required
             self.extra = material_data["metadata_decoded"]["extra_fields"]
             self.compound_elabid = self.extra["Compound"]["value"]
-            self.dimensions = self.extra["Size"]["value"]
+            self.dimensions = str(
+                self.extra["Size"]["value"]
+            )  # strings have a .count() method
+            if self.dimensions.count("mm") == 2:
+                self.dimensions_unit = "mm x mm"
+            elif self.dimensions[-1] == '"':
+                self.dimensions_unit = "inches"
+            else:
+                self.dimensions_unit = None
         except KeyError as k:
             # Some keys are not required and can be called through the .get() method - which is permissive and allows null values;
             # Other keys are required so if they can't be called (invalid or null) raise error and stop execution of the program:
-            raise KeyError(f"The provided dictionary lacks a \"{k}\" key. Check the target/substrate entry on eLabFTW and make sure you used the correct Resource template.")
+            raise KeyError(
-    def get_compound_data(self, apikey):
+                f'The provided dictionary lacks a "{k}" key. Check the target/substrate entry on eLabFTW and make sure you used the correct Resource template.'
-        raw_compound_data = APIHandler(apikey).get_entry_from_elabid(self.compound_elabid, entryType="items")
+            )
+
+    def get_compound_data(self, apikey, ELABFTW_API_URL):
+        """
+        Returns a dictionary with the relevant data on the compound of which the material is made.
+        The format of the dictionary is:
+            {
+                "name": str,
+                "chemical_formula": str,
+                "cas_number": str
+            }
+
+        Args:
+            api_key: str:           A valid API key for the eLabFTW instance where the data is stored, with permissions to access the relevant entries.
+                                    eLabFTW's API keys are well documented here: https://doc.elabftw.net/docs/usage/api/.
+                                    If you don't have an API key and are uncapable of creating one, contact your eLabFTW administrator.
+                                    Or RTFM and create one yourself, it's not that hard.
+            ELABFTW_API_URL: str:   URL for the API root endpoint of the eLabFTW instance. Ends with '/api/v2' - no trailing slash.
+        """
+        raw_compound_data = APIHandler(apikey, ELABFTW_API_URL).get_entry_from_elabid(
+            self.compound_elabid, entryType="items"
+        )
         name = raw_compound_data["title"]
         extra = raw_compound_data["metadata_decoded"]["extra_fields"]
         formula = extra.get("Chemical formula")
-        cas = extra.get("CAS number ") or { "value": None }
+        cas = extra.get("CAS number ") or {"value": None}
         compound_data = {
-            "name" : name,
+            "name": name,
-            "chemical_formula" : formula.get("value"),
+            "chemical_formula": formula.get("value"),
-            "cas_number" : cas.get("value")
+            "cas_number": cas.get("value"),
         }
         return compound_data
-    def get_compound_formula(self, apikey):
+
-        formula = self.get_compound_data(apikey).get("chemical_formula")
+    def get_compound_formula(self, apikey, ELABFTW_API_URL):
+        """
+        Returns a string with the chemical formula of the compound.
+
+        Args:
+            api_key: str:           A valid API key for the eLabFTW instance where the data is stored, with permissions to access the relevant entries.
+                                    eLabFTW's API keys are well documented here: https://doc.elabftw.net/docs/usage/api/.
+                                    If you don't have an API key and are uncapable of creating one, contact your eLabFTW administrator.
+                                    Or RTFM and create one yourself, it's not that hard.
+            ELABFTW_API_URL: str:   URL for the API root endpoint of the eLabFTW instance. Ends with '/api/v2' - no trailing slash.
+        """
+        formula = self.get_compound_data(apikey, ELABFTW_API_URL).get(
+            "chemical_formula"
+        )
         return formula
 
+
 class Substrate(Material):
+    """
+    Substrate(material_data) - where material_data is a Python dictionary.
+
+    Inherits from Material and it's meant to be used exclusively for eLabFTW Resources of the "Substrate" category.
+    """
+
     def __init__(self, material_data):
+        """
+        Properties/Attributes common to all Materials:
+            * name: str:            Name of the material.
+            * compound_elabid: int: eLabFTW internal id of the compound.
+            * dimensions: str:      Dimensions of the material, in standard format.
+                                    The class recognizes the unit of measurement and acts consequently.
+            * dimensions_unit: str: Unit of measurement - either "mm x mm", "inches" or None.
+
+        Specific properties/attributes:
+            * orientation: str:
+            * miscut_angle: str:
+            * miscut_angle_unit: str:
+            * miscut_direction: str:
+            * thickness: str:
+            * thickness_unit: str:
+            * surface_treatment: str:
+            * manufacturer: str:
+            * batch_id: str:
+        """
         super().__init__(material_data)
         try:
             self.orientation = self.extra["Orientation"]["value"]
             self.miscut_angle = self.extra["Miscut Angle"]["value"]
+            self.miscut_angle_unit = self.extra["Miscut Angle"]["unit"]
             self.miscut_direction = self.extra["Miscut Direction"]["value"]
             # Not present (yet) on eLabFTW for Substrates:
-            self.thickness = None #self.extra["Thickness"]["value"]
+            self.thickness = ""  # self.extra["Thickness"]["value"]
+            self.thickness_unit = "μm"  # self.extra["Thickness"]["unit"]
             self.surface_treatment = self.extra["Surface treatment"]["value"]
             self.manufacturer = self.extra["Supplier"]["value"]
             self.batch_id = self.extra["Batch ID"]["value"]
         except KeyError as k:
-            raise KeyError(f"The provided dictionary lacks a \"{k}\" key - which is specific for substrates. Check the {self.name} substrate entry on eLabFTW and make sure you used the correct Resource template.")
+            raise KeyError(
+                f'The provided dictionary lacks a "{k}" key - which is specific for substrates. Check the {self.name} substrate entry on eLabFTW and make sure you used the correct Resource template.'
+            )
+
 
 class Target(Material):
+    """
+    Target(material_data) - where material_data is a Python dictionary.
+
+    Inherits from Material and it's meant to be used exclusively for eLabFTW Resources of the "PLD Target" category.
+    """
+
     def __init__(self, material_data):
+        """
+        Properties/Attributes common to all Materials:
+            * name: str:            Name of the material.
+            * compound_elabid: int: eLabFTW internal id of the compound.
+            * dimensions: str:      Dimensions of the material, in standard format.
+                                    The class recognizes the unit of measurement and acts consequently.
+            * dimensions_unit: str: Unit of measurement - either "mm x mm", "inches" or None.
+
+        Specific properties/attributes:
+            * thickness: str:
+            * thickness_unit: str:
+            * shape: str:
+            * solid_form: str:
+            * manufacturer: str:
+        """
         super().__init__(material_data)
         try:
             self.thickness = self.extra["Thickness"]["value"]
+            self.thickness_unit = self.extra["Thickness"]["unit"]
             self.shape = self.extra["shape"]["value"]
             self.solid_form = self.extra["Solid form"]["value"]
             self.manufacturer = self.extra["Supplier"]["value"]
         except KeyError as k:
-            raise KeyError(f"The provided dictionary lacks a \"{k}\" key - which is specific for PLD targets. Check the {self.name} target entry on eLabFTW and make sure you used the correct Resource template.")
+            raise KeyError(
+                f'The provided dictionary lacks a "{k}" key - which is specific for PLD targets. Check the {self.name} target entry on eLabFTW and make sure you used the correct Resource template.'
+            )
         # Non-required attributes:
         self.description = material_data.get("body") or ""
 
 
+class Proposal:
+    """
+    Proposal(proposal_data) - where proposal_data is a Python dictionary.
 
-if __name__=="__main__":
+    Recovers only the relevant info on a proposal linked to the entrypoint sample.
-    head = Header("MyApiKey-123456789abcdef")
+    Which currently is just its name.
-    print(f"Example header:\n\t{head.header}\n")
+
-    print("Warning: you're not supposed to be running this as the main program.")
+    If the name starts with "Proposal " (space included) that gets omitted from the output.
+    """
+
+    def __init__(self, proposal_data):
+        """
+        Properties/Attributes:
+            * name: str:    Name of the proposal.
+                            If the name starts with "Proposal " (space included) that gets omitted from the output.
+        """
+        if "Proposal " in proposal_data["title"]:
+            self.name = proposal_data["title"].replace("Proposal ", "")
+        else:
+            self.name = proposal_data["title"]
+
+
+if __name__ == "__main__":
+    # head = APIHandler("MyApiKey-123456789abcdef")
+    # print(f"Example header:\n\t{head.header}\n")
+    # print("Warning: you're not supposed to be running this as the main program.")
+    api_key = getpass("Paste API key here [no echo]: ")
+    ELABFTW_API_URL = input("Enter a valid eLabFTW API URL (ends with '/api/v2)': ")
+    handler = APIHandler(api_key, ELABFTW_API_URL)
+    exp58 = handler.get_entry_from_elabid(elabid=58, entryType="experiments")
+    layer58 = Layer(exp58)
+    print(layer58.list_attachments())
+    print(layer58.fetch_textual_uploads())
+    print(layer58.fetch_images())

src/functions.py

@@ -1,62 +0,0 @@
-"""
-Currently unused!
-"""
-import json, requests
-from APIHandler import APIHandler
-
-def get_entry_from_elabid(elabid, entryType="items"):
-    '''
-    Function which returns entrypoint data (as dictionary) from its elabid.
-    '''
-    header = APIHandler(apikey).dump
-    response = requests.get(
-        headers = header,
-        url = f"{ELABFTW_API_URL}/{entryType}/{elabid}",
-        verify=True
-    )
-    if response.status_code // 100 in [2,3]:
-        entry_data = response.json()
-        return entry_data
-    else:
-        raise ConnectionError(f"HTTP request failed with status code: {response.status_code}.")
-
-def get_sample_layers_data(elabid):
-    '''
-    Return the following data from every eLabFTW experiment linked
-    to a certain sample, identified by elabid.
-
-    - Title of the experiment
-    - Category (should check it's "PLD Deposition")
-    - Layer number - if present (PLD depositions)
-    - Deposition time - returns error if not present
-    - Repetition rate - returns error if not present
-    '''
-    # header = {
-    #     "Authorization": apikey,
-    #     "Content-Type": "application/json"
-    # }
-    sample_data = requests.get(
-        headers = header,
-        url = f"https://elabftw.fisica.unina.it/api/v2/items/{elabid}",
-        verify=True
-    ).json()
-    related_experiments = sample_data["related_experiments_links"]
-    result = []
-    for exp in related_experiments:
-        experiment_data = requests.get(
-            headers = header,
-            url = f"https://elabftw.fisica.unina.it/api/v2/experiments/{exp.get("entityid")}",
-            verify=True
-        ).json()
-        extra = experiment_data["metadata_decoded"]["extra_fields"]
-        result.append(
-            {"title": exp.get("title"),
-             "layer_number": extra.get("Layer Progressive Number").get("value"),
-             "category": exp.get("category_title"),
-             "deposition_time": extra.get("Duration").get("value"),
-             "repetition_rate": extra.get("Repetition rate").get("value")}
-        )
-    return result
-
-if __name__=="__main__":
-    print("Warning: you're not supposed to be running this as the main program.")

src/schema/pld_deposition.py

@@ -0,0 +1,3 @@
+class Prova:
+    def __init__(self):
+        self.hello = "Hello world"