From 92b2fedb7a0ad8558c5913f333570e8d3dc1b491 Mon Sep 17 00:00:00 2001 From: nsheff Date: Fri, 1 Sep 2023 12:40:05 -0400 Subject: [PATCH 1/5] add skeleton for search interface --- bedhost/routers/api.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bedhost/routers/api.py b/bedhost/routers/api.py index 81066767..5f0c8b05 100644 --- a/bedhost/routers/api.py +++ b/bedhost/routers/api.py @@ -269,6 +269,13 @@ async def get_image_for_bedfile( return serve_file(path, remote) +@router.get("/search/{query}") +async def text_to_bed_search( + query: str = Query(..., description="Search query string") +): + return bbc.t2bsi.nl_search(query) + + @router.get("/bed/{md5sum}/img_path/{id}") async def get_image_path_for_bedfile( md5sum: str = bd, From 60c194b30efaa8423ac8b32c0f1247b06d3fae4e Mon Sep 17 00:00:00 2001 From: nsheff Date: Fri, 1 Sep 2023 12:53:59 -0400 Subject: [PATCH 2/5] allow all origins --- bedhost/main.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bedhost/main.py b/bedhost/main.py index b6af20b5..e51eaef0 100644 --- a/bedhost/main.py +++ b/bedhost/main.py @@ -28,13 +28,7 @@ # uncomment below for development, to allow cross origin resource sharing app.add_middleware( CORSMiddleware, - allow_origins=[ - "http://localhost:3000", - "http://localhost:8000", - "http://dev1.bedbase.org", - "http://data.bedbase.org", - "http://bedbase.org", - ], + allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"], From 6c296002e8c2b7b668ee1191a31b8e129fcd8ba8 Mon Sep 17 00:00:00 2001 From: nsheff Date: Fri, 1 Sep 2023 12:57:12 -0400 Subject: [PATCH 3/5] changelog, version 0.1.3 release --- bedhost/_version.py | 2 +- docs/changelog.md | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bedhost/_version.py b/bedhost/_version.py index b3f47562..ae736254 100644 --- a/bedhost/_version.py +++ b/bedhost/_version.py @@ -1 +1 @@ -__version__ = "0.1.2" +__version__ = "0.1.3" diff --git a/docs/changelog.md b/docs/changelog.md index 7d57bb4b..2192e45b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,13 +2,16 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format. -## [0.1.2] -- 2023-2-6 +## [0.1.3] -- 2023-09-0 +- allow all origins + +## [0.1.2] -- 2023-02-06 ### change -- change `/bedset/my_bedset/file_paths`endpoint from GET to POST +- change `/bedset/my_bedset/file_paths`endpoint from GET to POST ## [0.1.1] -- 2021-10-30 ### change -- `/bed/genomes` and `bedset/genomes`: impove speed +- `/bed/genomes` and `bedset/genomes`: impove speed ## [0.1.0] -- 2021-10-25 ### add From 6c2fe570d5f8273d8837b48026768c03b763644b Mon Sep 17 00:00:00 2001 From: nsheff Date: Fri, 1 Sep 2023 12:59:01 -0400 Subject: [PATCH 4/5] version changelog bump for 0.2 --- bedhost/_version.py | 2 +- docs/changelog.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bedhost/_version.py b/bedhost/_version.py index ae736254..fa831bea 100644 --- a/bedhost/_version.py +++ b/bedhost/_version.py @@ -1 +1 @@ -__version__ = "0.1.3" +__version__ = "0.2.0-dev" diff --git a/docs/changelog.md b/docs/changelog.md index 2192e45b..2a199d39 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format. +## [0.2.0] -- Unreleased +- remove all graphql +- remove local static hosting of UI +- update to new pipestat-based bbconf (pending) + ## [0.1.3] -- 2023-09-0 - allow all origins From 2da9df2ba8bb67c5cbe6bba14c79f59f342c4541 Mon Sep 17 00:00:00 2001 From: nsheff Date: Fri, 1 Sep 2023 12:59:13 -0400 Subject: [PATCH 5/5] add info on alternative config --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 1b14c41d..0ff1ccac 100644 --- a/README.md +++ b/README.md @@ -102,3 +102,8 @@ For development, you can now also run it with `uvicorn`, which gives you auto-re source ../bedboss/environment/production.env BEDBASE_CONFIG=../bedbase.org/config/bedbase.yaml uvicorn bedhost.main:app --reload ``` + +Using a local config: + +BEDBASE_CONFIG=../bbconf/tests/data/config.yaml uvicorn bedhost.main:app --reload +