Merge pull request #651 from thoth-pub/feature/implement_redis

Feature/implement redis

.env.example

@@ -6,6 +6,8 @@ THOTH_EXPORT_API=http://localhost:8181
 THOTH_DOMAIN=localhost
 # Full postgres URL
 DATABASE_URL=postgres://thoth:thoth@localhost/thoth
+# Full redis URL
+REDIS_URL=redis://localhost:6379
 # Authentication cookie secret key
 SECRET_KEY=an_up_to_255_bytes_random_key
 # Logging level

.github/workflows/build_test_and_check.yml

@@ -27,6 +27,7 @@ env:
   CARGO_TERM_COLOR: always
   THOTH_GRAPHQL_API: https://api.thoth.pub
   THOTH_EXPORT_API: https://export.thoth.pub
+  TEST_REDIS_URL: redis://localhost:6379
 
 jobs:
   build:
@@ -46,6 +47,16 @@ jobs:
         run: cargo build -vv
   test:
     runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis:alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4

.github/workflows/docker_build_and_push_to_dockerhub.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
   workflow_dispatch:
 
+env:
+  REGISTRY: ghcr.io
+
 jobs:
   build_and_push_staging_docker_image:
     runs-on: ubuntu-latest
@@ -16,19 +19,20 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            openbookpublishers/thoth
+            ${{ env.REGISTRY }}/thoth-pub/thoth
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=pr,prefix=staging-pr-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
+      - name: Login to Container registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v5
@@ -54,7 +58,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: false
-          tags: openbookpublishers/thoth:latest
+          tags: thoth-pub/thoth:latest
           file: Dockerfile.dev
           build-args: |
             THOTH_GRAPHQL_API=https://api.thoth.pub

.github/workflows/docker_build_and_push_to_dockerhub_release.yml

@@ -4,6 +4,9 @@ on:
   release:
     types: [published]
 
+env:
+  REGISTRY: ghcr.io
+
 jobs:
   build_and_push_docker_image:
     runs-on: ubuntu-latest
@@ -16,7 +19,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            openbookpublishers/thoth
+            ${{ env.REGISTRY }}/thoth-pub/thoth
           # generate Docker tags based on the following events/attributes
           tags: |
             type=semver,pattern={{version}}
@@ -26,11 +29,12 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
+      - name: Login to Container registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v5

CHANGELOG.md

@@ -6,7 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- [648](https://github.com/thoth-pub/thoth/issues/648) - Added new `LocationPlatform`, `THOTH`, for Locations where file is hosted directly by Thoth on S3.
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Implement Redis connection pools using `deadpool-redis`
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Implement Redis caching in export API
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Added `WorkLastUpdatedQuery` and `WorksLastUpdatedQuery` queries to thoth-client
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Implement `Copy`, `Ord` and `PartialOrd` traits for `Timestamp`
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Implement parsing from and to RFC 3339 strings for `Timestamp`
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Implement `Copy` trait for `WorkType`, `WorkStatus`, `PublicationType`, `CountryCode`, `LanguageRelation`, `LanguageCode`, `LocationPlatform`, `LengthUnit`, `WeightUnit`, `CurrencyCode`, and `SeriesType`
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Allow supplying `DATABASE_URL` as binary argument
+  - [648](https://github.com/thoth-pub/thoth/issues/648) - Added new `LocationPlatform`, `THOTH`, for Locations where file is hosted directly by Thoth on S3.
+
+### Changed
+  - [651](https://github.com/thoth-pub/thoth/pull/651) - Use Github Container registry instead of DockerHub
 
 ### Fixed
   - [631](https://github.com/thoth-pub/thoth/issues/631) - Fix slow loading of Contributor dropdown in Contribution form

Cargo.toml

@@ -1,15 +1,14 @@
 [package]
 name = "thoth"
 version = "0.12.14"
-authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
+authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
 description = "GraphQL API for bibliographic data"
 repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [badges]
-travis-ci = { repository = "openbookpublishers/thoth" }
 maintenance = { status = "actively-developed" }
 
 [workspace]

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Open Book Publishers
+   Copyright 2020 Thoth Open Metadata
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -10,6 +10,7 @@
 	docker-dev-build \
 	docker-dev-run \
 	docker-dev-db \
+	docker-dev-redis \
 	build \
 	test \
 	clippy \
@@ -44,6 +45,9 @@ docker-dev-run:
 docker-dev-db:
 	docker compose -f docker-compose.dev.yml up db
 
+docker-dev-redis:
+	docker compose -f docker-compose.dev.yml up redis
+
 build:
 	cargo build -vv
 

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
+  <img src="https://cdn.thoth.pub/thoth_logo.png" height="400" />
 
   <h1>Thoth</h1>
 
@@ -127,7 +127,7 @@ The wasm APP needs to know the endpoint the API will be running at compile time,
 docker build \
     --build-arg THOTH_GRAPHQL_API=https://api.thoth.pub \
     --build-arg THOTH_EXPORT_API=https://export.thoth.pub \
-    . -t openbookpublishers/thoth
+    . -t thoth-pub/thoth
 ```
 
 ## Acknowledgements

docker-compose.dev.yml

@@ -11,6 +11,12 @@ services:
     env_file:
       - .env
 
+  redis:
+    image: redis:alpine
+    container_name: "thoth_redis"
+    ports:
+      - "6379:6379"
+
   graphql-api:
     build:
       context: .