Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2023-029
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2023-029
2023-029
Commits
c40e2ab2
Commit
c40e2ab2
authored
Sep 05, 2023
by
Ridma Dilshan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into IT20005276
parents
5f137e40
ec333ed1
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
276 deletions
+21
-276
Project/Backend/Server_Python/app.log
Project/Backend/Server_Python/app.log
+20
-260
Project/Backend/Server_Python/main.py
Project/Backend/Server_Python/main.py
+1
-16
No files found.
Project/Backend/Server_Python/app.log
View file @
c40e2ab2
This diff is collapsed.
Click to expand it.
Project/Backend/Server_Python/main.py
View file @
c40e2ab2
from
fastapi
import
FastAPI
from
fastapi
import
FastAPI
<<<<<<<
HEAD
from
controllers
import
translate_controler
,
users_controller
# from Project.Backend.Server_Python.controllers import audio_detect_controler
from
controllers
import
translate_controler
,
users_controller
,
audio_detect_controler
,
video_detect_controler
=======
from
controllers
import
(
translate_controler
,
users_controller
,
video_to_sign_language_controller
,
)
>>>>>>>
master
from
fastapi.responses
import
RedirectResponse
from
fastapi.responses
import
RedirectResponse
from
fastapi.middleware.cors
import
CORSMiddleware
from
fastapi.middleware.cors
import
CORSMiddleware
from
pymongo.mongo_client
import
MongoClient
from
pymongo.mongo_client
import
MongoClient
...
@@ -46,12 +37,6 @@ logger = setup_logger()
...
@@ -46,12 +37,6 @@ logger = setup_logger()
app
.
include_router
(
users_controller
.
router
)
app
.
include_router
(
users_controller
.
router
)
app
.
include_router
(
translate_controler
.
router
)
app
.
include_router
(
translate_controler
.
router
)
<<<<<<<
HEAD
app
.
include_router
(
audio_detect_controler
.
router
)
app
.
include_router
(
video_detect_controler
.
router
)
=======
app
.
include_router
(
video_to_sign_language_controller
.
router
)
>>>>>>>
master
# Add cores middleware
# Add cores middleware
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment