Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Release v0.13.0 #360

Merged
merged 85 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
1b964c1
start mutations, augment endpoint to accept body
nleroy917 Jul 3, 2024
728af38
finish mutations for projectViews
nleroy917 Jul 3, 2024
89093b6
Merge pull request #335 from pepkit/322_view_mutations
nleroy917 Jul 9, 2024
64f9b08
progress on views modal
sanghoonio Jul 16, 2024
0a10d26
merge dev changes
sanghoonio Jul 16, 2024
9e8c2a0
start mocking up schemas
nleroy917 Jul 18, 2024
13ebee7
project help tab
sanghoonio Jul 18, 2024
0d80cb1
Merge branch 'dev' into dev_sam
sanghoonio Jul 18, 2024
5e5ff08
Merge branch 'dev' into dev_sam
sanghoonio Jul 18, 2024
60eda14
fix issue with taskdef
nleroy917 Jul 18, 2024
e5594c9
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
nleroy917 Jul 18, 2024
9601dca
view selector style
sanghoonio Jul 18, 2024
23c09dd
Merge branch 'dev' into dev_sam
sanghoonio Jul 18, 2024
9c708c3
view settings ui and other ui cleanup
sanghoonio Jul 20, 2024
4e468a1
revert view api endpoints
sanghoonio Jul 22, 2024
605ce92
start fleshing out the endpoints
nleroy917 Jul 22, 2024
09d25d3
more schemas and groups API work
nleroy917 Jul 22, 2024
9b7ca67
even more
nleroy917 Jul 22, 2024
b61e76e
much more work on schemas
nleroy917 Jul 22, 2024
3d3cb45
add and remove views somewhat work
sanghoonio Jul 22, 2024
559cb5e
view gear button now indicates through color change that a view can b…
sanghoonio Jul 23, 2024
d143d5c
added newlines to project.py and models.py to pass lint check
sanghoonio Jul 23, 2024
112a7ac
reformatted with black
sanghoonio Jul 23, 2024
3f781a9
Merge pull request #359 from pepkit/dev_sam
sanghoonio Jul 23, 2024
8e29d35
address pr comments
sanghoonio Jul 23, 2024
d10ad85
more schema stuff
nleroy917 Jul 23, 2024
a30240c
deleting the schemas works
nleroy917 Jul 23, 2024
a70e147
you can now edit schemas
nleroy917 Jul 23, 2024
2b71105
edit schema descriptions
nleroy917 Jul 23, 2024
c513228
added schemas to landing page
khoroshevskyi Jul 24, 2024
d665b03
few updates
khoroshevskyi Jul 24, 2024
2a0f830
merge
nleroy917 Jul 24, 2024
f390618
Merge remote-tracking branch 'refs/remotes/origin/schemas' into schemas
nleroy917 Jul 24, 2024
8d5d508
fix globals.css
nleroy917 Jul 24, 2024
61fd57b
other small changes
khoroshevskyi Jul 24, 2024
b178905
small changes
nleroy917 Jul 24, 2024
6e380a2
Merge remote-tracking branch 'refs/remotes/origin/schemas' into schemas
nleroy917 Jul 24, 2024
98aa3ce
bump vite
nleroy917 Jul 24, 2024
aabea44
updated models
khoroshevskyi Jul 24, 2024
41c4d19
allow schema uploads
nleroy917 Jul 24, 2024
0b69bde
conflicts
nleroy917 Jul 24, 2024
dd249a4
remove useEffect for debugging
nleroy917 Jul 24, 2024
31e77b8
added order by to schemas
khoroshevskyi Jul 24, 2024
30ba839
more updates
nleroy917 Jul 24, 2024
430423f
Merge branch 'dev' into schemas
nleroy917 Jul 24, 2024
5eb0692
Merge pull request #358 from pepkit/schemas
nleroy917 Jul 24, 2024
9da2bb3
massage ViewOptionsModal into place
nleroy917 Jul 24, 2024
3cd8be6
check for empty filteredSamples
nleroy917 Jul 24, 2024
786614c
sample table things
nleroy917 Jul 24, 2024
d18dd65
more
nleroy917 Jul 24, 2024
892cc3e
remove help page view
nleroy917 Jul 24, 2024
1d7c092
fix global search box
nleroy917 Jul 24, 2024
fd3be65
fix project form cnacel
nleroy917 Jul 24, 2024
9352faa
more things
nleroy917 Jul 24, 2024
f981040
update gear button glow logic
sanghoonio Jul 24, 2024
25dca40
overlaytrigger for view selector was being annoying
sanghoonio Jul 24, 2024
dc7e53a
fix typescript errors
nleroy917 Jul 25, 2024
698ebcc
tweaks'
nleroy917 Jul 25, 2024
81ecc80
fix detail
nleroy917 Jul 25, 2024
d8b38e2
work on landing page
nleroy917 Jul 25, 2024
2ab40c4
view selector and modal small ui and logic updates
sanghoonio Jul 25, 2024
e504142
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
sanghoonio Jul 25, 2024
1098631
fix search field in schemas
nleroy917 Jul 25, 2024
f8294f4
pagination + search to schemas
nleroy917 Jul 25, 2024
3e656b8
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
nleroy917 Jul 25, 2024
2d9647d
add shadows
nleroy917 Jul 25, 2024
66c4a96
updated about page
khoroshevskyi Jul 25, 2024
6f08e1b
Merge remote-tracking branch 'origin/dev' into dev
khoroshevskyi Jul 25, 2024
f5141ef
fix delete tab not showing for users
nleroy917 Jul 25, 2024
d55b28a
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
nleroy917 Jul 25, 2024
5a3c839
bump version
nleroy917 Jul 25, 2024
9f1548d
remove about pages
nleroy917 Jul 25, 2024
135ed4b
updated python code
khoroshevskyi Jul 25, 2024
62899bd
Merge remote-tracking branch 'origin/dev' into dev
khoroshevskyi Jul 25, 2024
0d4edf1
requirements and version
khoroshevskyi Jul 25, 2024
c75f14f
fixed uploading project default schema
khoroshevskyi Jul 25, 2024
5eaa89e
fixed uploading project default schema2
khoroshevskyi Jul 25, 2024
1c022b6
updated peppy version
khoroshevskyi Jul 25, 2024
549d46c
remove default schema
nleroy917 Jul 25, 2024
9a34c76
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
nleroy917 Jul 25, 2024
5ce1de6
fix schema bug
nleroy917 Jul 25, 2024
6afdfd1
UI tweaks
nleroy917 Jul 25, 2024
94e8232
no schema button ui
sanghoonio Jul 25, 2024
5c597b2
max width on schema
nleroy917 Jul 25, 2024
fe01e00
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
nleroy917 Jul 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions deployment/task_defs/primary.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"family": "pephub-task",
"containerDefinitions": [
{
"name": "pephub-container",
"cpu": "512",
"name": "pephub-container",
"cpu": 512,
"memory": 6096,
"memoryReservation": 512,
"memoryReservation": 512,
"portMappings": [
{
"hostPort": 8120,
Expand Down Expand Up @@ -108,9 +108,7 @@
"placementConstraints": [],
"taskRoleArn": "ecsTaskExecutionRole",
"pidMode": null,
"requiresCompatibilities": [
"EC2"
],
"requiresCompatibilities": ["EC2"],
"networkMode": "bridge",
"inferenceAccelerators": null,
"proxyConfiguration": null,
Expand Down
4 changes: 3 additions & 1 deletion environment/local.dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ export HF_MODEL="BAAI/bge-small-en-v1.5"

export GH_CLIENT_ID=`pass databio/pephub/gh_client_id`
export GH_CLIENT_SECRET=`pass databio/pephub/gh_client_secret`
export BASE_URI=http://localhost:8000
export BASE_URI=http://localhost:8000

export PH_DEV_MODE=true
2 changes: 1 addition & 1 deletion pephub/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.12.0"
__version__ = "0.13.0"
2 changes: 1 addition & 1 deletion pephub/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

CALLBACK_ENDPOINT = "/auth/callback"

DEFAULT_PEP_SCHEMA = "pep/2.1.0"
DEFAULT_PEP_SCHEMA = "databio/pep-2.1.0"
DEFAULT_TAG = "default"

DEFAULT_QDRANT_SCORE_THRESHOLD = (
Expand Down
2 changes: 1 addition & 1 deletion pephub/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from fastapi import Depends, Header, Query
from fastapi.exceptions import HTTPException
from fastapi.security import HTTPBearer
from fastembed.embedding import FlagEmbedding as Embedding
from fastembed.embedding import TextEmbedding as Embedding
from pepdbagent import PEPDatabaseAgent
from pepdbagent.const import DEFAULT_TAG
from pepdbagent.exceptions import ProjectNotFoundError
Expand Down
4 changes: 4 additions & 0 deletions pephub/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
from .routers.api.v1.project import project as api_project
from .routers.api.v1.project import projects as api_projects
from .routers.api.v1.search import search as api_search
from .routers.api.v1.schemas import schemas as api_schemas
from .routers.api.v1.schemas import groups as api_groups
from .routers.auth.base import auth as auth_router
from .routers.eido.eido import router as eido_router

Expand Down Expand Up @@ -82,6 +84,8 @@
app.include_router(api_project)
app.include_router(api_projects)
app.include_router(api_search)
app.include_router(api_schemas)
app.include_router(api_groups)
app.include_router(auth_router)
app.include_router(eido_router)

Expand Down
11 changes: 3 additions & 8 deletions pephub/routers/api/v1/namespace.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import json
import shutil
import tempfile
from typing import List, Literal, Optional, Union

import peppy
from dotenv import load_dotenv
from fastapi import APIRouter, Depends, File, Form, HTTPException, Request, UploadFile
from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile
from fastapi.responses import JSONResponse
from pepdbagent import PEPDatabaseAgent
from pepdbagent.const import DEFAULT_LIMIT_INFO
Expand All @@ -27,17 +26,13 @@
from typing_extensions import Annotated

from ....const import (
BLANK_PEP_CONFIG,
BLANK_PEP_SAMPLE_TABLE,
DEFAULT_PEP_SCHEMA,
DEFAULT_TAG,
)
from ....dependencies import (
get_db,
get_namespace_access_list,
get_namespace_info,
get_user_from_session_info,
read_authorization_header,
verify_user_can_write_namespace,
get_pepdb_namespace_info,
)
Expand Down Expand Up @@ -148,7 +143,7 @@ async def create_pep(
is_private: bool = Form(False),
tag: str = Form(DEFAULT_TAG),
description: Union[str, None] = Form(None),
pep_schema: str = Form(DEFAULT_PEP_SCHEMA),
pep_schema: str = Form(None),
files: List[UploadFile] = File(
None # let the file upload be optional. dont send a file? We instantiate with blank
),
Expand Down Expand Up @@ -208,7 +203,7 @@ async def create_pep(
# create a blank peppy.Project object with fake files
else:
raise HTTPException(
detail=f"Project files were not provided",
detail="Project files were not provided",
status_code=400,
)

Expand Down
2 changes: 1 addition & 1 deletion pephub/routers/api/v1/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ async def create_view_of_the_project(
_LOGGER.error(f"Could not create view. Error: {e}")
raise HTTPException(
status_code=409,
detail="Could not create view",
detail="A view with this name already exists in the project.",
)
return JSONResponse(
content={
Expand Down
Loading
Loading