Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Error fixing on landing page #699

Merged
merged 8 commits into from
Sep 11, 2023
Merged

Error fixing on landing page #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf06a0b
FAST API: 0.101.1 -> pydantic v1
Joel-Joseph-George Aug 23, 2023
fc29d98
FAST API:changes in packages
Joel-Joseph-George Aug 24, 2023
c8781b9
Merge pull request #687 from shimilgithub/api-refactor
kavitharaju Aug 25, 2023
139d984
Merge branch 'API-refactor' of https://github.com/Bridgeconn/vachan-a…
Joel-Joseph-George Aug 25, 2023
98ec5b0
FAST API: Text changes
Joel-Joseph-George Aug 25, 2023
96fb0d2
Merge pull request #682 from Joel-Joseph-George/terminology-2
shimilgithub Aug 25, 2023
77b24af
Merge pull request #694 from shimilgithub/api-refactor
kavitharaju Sep 4, 2023
c2d68da
UPDATE: on landing page and Fast api upgradation
Joel-Joseph-George Sep 8, 2023
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
8 changes: 4 additions & 4 deletions app/routers/auth_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ def logout(request: Request,user_details =Depends(get_user_or_none),#pylint: dis
,tags=["Authentication"])
@get_auth_access_check_decorator
async def get_identities_list(request: Request,#pylint: disable=unused-argument
name: str = Query(None, example="Bridgeconn"),
user_id: str = Query(None, example="ecf57420-9rg0-40t8-b56b-dce1fc52c452"),
name: str = Query(None, examples="Bridgeconn"),
user_id: str = Query(None, examples="ecf57420-9rg0-40t8-b56b-dce1fc52c452"),
roles:List[schema_auth.FilterRoles]=Query([schema_auth.FilterRoles.ALL]),
skip: int = Query(0, ge=0),limit: int = Query(100, ge=0),
user_details =Depends(get_user_or_none),db_: Session = Depends(get_db)):#pylint: disable=unused-argument
Expand All @@ -100,7 +100,7 @@ async def get_identities_list(request: Request,#pylint: disable=unused-argument
,tags=["Authentication"])
@get_auth_access_check_decorator
async def get_user_profile(request: Request,#pylint: disable=unused-argument
user_id:str =Path(...,example="4bd012fd-7de8-4d66-928f-4925ee9bb"),
user_id:str =Path(...,examples="4bd012fd-7de8-4d66-928f-4925ee9bb"),
user_details =Depends(get_user_or_none),db_: Session = Depends(get_db)):#pylint: disable=unused-argument
'''fetches user profile Data'''
log.info('In User Profile')
Expand Down Expand Up @@ -132,7 +132,7 @@ async def userrole(role_data:schema_auth.UserRole,request: Request,#pylint: disa
500: {"model": schemas.ErrorResponse}},status_code=201,tags=["Authentication"])
@get_auth_access_check_decorator
async def edit_user(request: Request,#pylint: disable=unused-argument
user_id:str =Path(...,example="4bd012fd-7de8-4d66-928f-4925ee9bb"),
user_id:str =Path(...,examples="4bd012fd-7de8-4d66-928f-4925ee9bb"),
edit_details:schema_auth.EditUser = Body(...),
user_details =Depends(get_user_or_none),db_: Session = Depends(get_db)):#pylint: disable=unused-argument
'''update user data'''
Expand Down
188 changes: 94 additions & 94 deletions app/routers/content_apis.py
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions app/routers/filehandling_apis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
status_code=200, tags=['File Handling', 'Bibles'])
@get_auth_access_check_decorator
async def usfm_parse_resource_bible(request: Request,
resource_name: schemas.TableNamePattern = Path(..., example="hi_IRV_1_bible"),
book_code: schemas.BookCodePattern=Path(..., example="mat"),
output_format: usfm_grammar.Format = Path(..., example="usx"),
resource_name: schemas.TableNamePattern = Path(..., examples="hi_IRV_1_bible"),
book_code: schemas.BookCodePattern=Path(..., examples="mat"),
output_format: usfm_grammar.Format = Path(..., examples="usx"),
content_filter: usfm_grammar.Filter = Query(usfm_grammar.Filter.SCRIPTURE_PARAGRAPHS),
chapter: int=Query(None, example=1),
# verse: int=Query(None, example=1), last_verse: int=Query(None, example=15),
chapter: int=Query(None, examples=1),
# verse: int=Query(None, examples=1), last_verse: int=Query(None, examples=15),
active: bool=True,
# skip: int=Query(0, ge=0), limit: int=Query(100, ge=0),
user_details = Depends(get_user_or_none),
Expand Down Expand Up @@ -58,11 +58,11 @@ async def usfm_parse_resource_bible(request: Request,
status_code=200, tags=['File Handling'])
@get_auth_access_check_decorator
async def parse_uploaded_usfm(request:Request,
output_format: usfm_grammar.Format = Path(..., example="usx"),
output_format: usfm_grammar.Format = Path(..., examples="usx"),
content_filter: usfm_grammar.Filter = Query(usfm_grammar.Filter.SCRIPTURE_PARAGRAPHS),
input_usfm: schema_content.UploadedUsfm = Body(...),
chapter: int=Query(None, example=1),
# verse: int=Query(None, example=1), last_verse: int=Query(None, example=15),
chapter: int=Query(None, examples=1),
# verse: int=Query(None, examples=1), last_verse: int=Query(None, examples=15),
user_details=Depends(get_user_or_none)):
'''Allows to upload a USFM file to be converted to another format. uses usfm-grammar'''
log.info("In parse_uploaded_usfm router function")
Expand Down
16 changes: 8 additions & 8 deletions app/routers/media_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ async def get_and_accesscheck_for_repo(repo, file_path, tag, permanent_link, db_
@get_auth_access_check_decorator
async def stream_media(request: Request, #pylint: disable=unused-argument,too-many-arguments
access_token: str = Query(None),
repo: str = Query(None,example="kavitha.raju/trial-media-project"),
tag: str = Query(None,example="main"),
file_path: str=Query(None,example="token videos/Apostle.MOV"),
permanent_link: str=Query(None,example=
repo: str = Query(None,examples="kavitha.raju/trial-media-project"),
tag: str = Query(None,examples="main"),
file_path: str=Query(None,examples="token videos/Apostle.MOV"),
permanent_link: str=Query(None,examples=
"https://gitlab.bridgeconn.com/kavitha.raju/"+
"trial-media-project/-/raw/main/token videos/Apostle.MOV"),
start_time: Optional[datetime] =Query(None),
Expand Down Expand Up @@ -110,10 +110,10 @@ async def stream_media(request: Request, #pylint: disable=unused-argument,too-ma
@get_auth_access_check_decorator
async def download_media(request: Request, #pylint: disable=too-many-arguments
access_token: str = Query(None),
repo: str = Query(None,example="kavitha.raju/trial-media-project"),
tag: str = Query(None,example="main"),
file_path: str=Query(None,example="token videos/Apostle.MOV"),
permanent_link: str=Query(None,example=
repo: str = Query(None,examples="kavitha.raju/trial-media-project"),
tag: str = Query(None,examples="main"),
file_path: str=Query(None,examples="token videos/Apostle.MOV"),
permanent_link: str=Query(None,examples=
"https://gitlab.bridgeconn.com/kavitha.raju/"+
"trial-media-project/-/raw/main/token videos/Apostle.MOV"),
db_: Session = Depends(get_db)):
Expand Down
Loading
Loading