Commit d7385635 authored by Lars Dalby's avatar Lars Dalby
Browse files

Merge branch 'dev' into 'main' 

Add REST API, database ops, and sourceimages transform (v0.3.0)

See merge request !5
parents efd85074 e182e8cf

.Rbuildignore

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ 
^\.DS_Store$

^CLAUDE\.md$

^\.claude$

^Dockerfile$

^erda_index\.parquet$

.gitignore

+2 −1
Original line number Diff line number Diff line 
.DS_Store

.claude/
 
 No newline at end of file

DESCRIPTION

+8 −2
Original line number Diff line number Diff line 
Package: erdatools

Type: Package

Title: Access 'ERDA' Data Archive via SFTP and HTTP

Version: 0.2.0

Version: 0.3.0

Authors@R: person("Lars", "Dalby", role = c("aut", "cre", "cph"),

    email = "lars@ecos.au.dk")

Description: Utilities for listing folders and reading image EXIF
@@ -20,6 +20,12 @@ Imports: 
Suggests:

    testthat (>= 3.0.0),

    withr,

    pkgload

    pkgload,

    callr,

    httr2,

    httpuv,

    plumber,

    DBI,

    RPostgres

Config/testthat/edition: 3

RoxygenNote: 7.3.3

Dockerfile

0 → 100644
+32 −0
Original line number Diff line number Diff line 
FROM rocker/r-ver:4.5.2



# System dependencies: SSH (for SFTP), libpq (for PostgreSQL), libssh2

RUN apt-get update && apt-get install -y --no-install-recommends \

    libssh2-1-dev \

    libpq-dev \

    libssl-dev \

    openssh-client \

    && rm -rf /var/lib/apt/lists/*



# Install R packages

RUN install2.r --error --skipinstalled \

    cli \

    fs \

    jsonlite \

    nanoparquet \

    purrr \

    tibble \

    plumber \

    callr \

    DBI \

    RPostgres



WORKDIR /app

COPY . /app



# Install the erdatools package

RUN R CMD INSTALL --no-multiarch --with-keep.source .



EXPOSE 8000



CMD ["R", "-e", "plumber::pr_run(plumber::pr('scripts/api.R'), host = '0.0.0.0', port = 8000)"]

NAMESPACE

+10 −0
Original line number Diff line number Diff line 
# Generated by roxygen2: do not edit by hand



export(et_build_sourceimages)

export(et_db_connect)

export(et_db_get_deployment_id)

export(et_db_get_partner_folder)

export(et_db_write_sourceimages)

export(et_exif_tags)

export(et_filter_media_files)

export(et_img_url)

export(et_index_dir)

export(et_index_filter)

export(et_index_update)

export(et_job_create)

export(et_job_get)

export(et_job_list)

export(et_job_set_process)

export(et_job_update)

export(et_parquet_folders_done)

export(et_parse_camalien_filename)

export(et_sftp_batch)