diff --git a/osm/schemas/metrics_schemas.py b/osm/schemas/metrics_schemas.py index 48985a84..7aa83934 100644 --- a/osm/schemas/metrics_schemas.py +++ b/osm/schemas/metrics_schemas.py @@ -150,7 +150,7 @@ class RtransparentMetrics(EmbeddedModel): # some extra fields affiliation_aff_id: Optional[str] = None affiliation_all: Optional[str] = None - article: Optional[str] = None + article: Optional[int] = None author: Optional[str] = None author_aff_id: Optional[str] = None correspondence: Optional[str] = None diff --git a/web/deploy/README.md b/web/deploy/README.md index 9e74e7b5..18b45df1 100644 --- a/web/deploy/README.md +++ b/web/deploy/README.md @@ -22,7 +22,7 @@ Guidance for deployment using Terraform and Docker Compose and GitHub Actions. - S3 bucket configuration for storing Terraform state files. - DynamoDB table for state locking. -4. **Deployment Script (deploy.sh)** +4. **Deployment Script (deploy.py)** - **Purpose**: Automate the deployment process for local development (staging environment). - **Steps**: - Set environment variables. diff --git a/web/deploy/compose.override.yaml b/web/deploy/compose.override.yaml deleted file mode 100644 index 5a327f7a..00000000 --- a/web/deploy/compose.override.yaml +++ /dev/null @@ -1,20 +0,0 @@ -services: - osm_web_api: - environment: - - MONGODB_URI=mongodb://db:27017/test - # - MONGODB_URI=mongodb://mongoadmin:secret@db:27017/osm - volumes: - - ./:/app/app - working_dir: /app/app - command: ["fastapi","dev","--host","0.0.0.0","--port","80"] - depends_on: - - db - - db: - image: mongo:4.4.6 - ports: - - 27017:27017 - environment: - - MONGO_INITDB_DATABASE=test - # - MONGO_INITDB_ROOT_USERNAME=mongoadmin - # - MONGO_INITDB_ROOT_PASSWORD=secret diff --git a/web/deploy/compose.yaml b/web/deploy/compose.yaml deleted file mode 100644 index 0110735e..00000000 --- a/web/deploy/compose.yaml +++ /dev/null @@ -1,39 +0,0 @@ -services: - osm_web_api: - image: osm_web_api - environment: - - MONGODB_URI="mongodb+srv://the_rest_of_the_connection_string" - ports: - - 80:80 - # traefik: - # image: traefik:v3.1 - # volumes: - # - "/var/run/docker.sock:/var/run/docker.sock" - # - "./traefik:/etc/traefik" - # - "./letsencrypt:/letsencrypt" - # ports: - # - "80:80" - # - "443:443" - traefik: - image: "traefik" - container_name: "traefik" - command: - - "--api.insecure=true" - - "--metrics.prometheus=true" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - - "--entrypoints.websecure.address=:443" - - "--entrypoints.websecure.http.tls=true" - - "--entrypoints.websecure.http.tls.certresolver=letsencrypt" - # http -> https redirect - - "--entrypoints.web.http.redirections.entryPoint.to=websecure" - - "--entrypoints.web.http.redirections.entryPoint.scheme=https" - - "--entrypoints.web.http.redirections.entrypoint.permanent=true" - ports: - - "80:80" - - "443:443" - - "8080:8080" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - myrttle_letsencrypt:/letsencrypt