Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
NACSOS Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MCC APSIS
NACSOS
NACSOS Core
Commits
bb40503b
"jrqa.m" did not exist on "6553b9ec6fed5bfc96cb2a54fbe11df404028e8b"
Commit
bb40503b
authored
1 year ago
by
Tim Repke
Browse files
Options
Downloads
Patches
Plain Diff
add count nql
parent
07aa9730
No related branches found
No related tags found
1 merge request
!77
Master
Pipeline
#2556
canceled
1 year ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/api/routes/search.py
+24
-15
24 additions, 15 deletions
server/api/routes/search.py
with
24 additions
and
15 deletions
server/api/routes/search.py
+
24
−
15
View file @
bb40503b
from
typing
import
TYPE_CHECKING
import
httpx
from
nacsos_data.db.schemas
import
Project
,
ItemType
from
pydantic
import
BaseModel
from
fastapi
import
APIRouter
,
Depends
import
sqlalchemy.sql.functions
as
func
from
sqlalchemy
import
select
from
sqlalchemy.ext.asyncio
import
AsyncSession
from
nacsos_data.db.engine
import
ensure_session
from
nacsos_data.db.schemas
import
Project
,
ItemType
from
nacsos_data.util.nql
import
NQLQuery
,
NQLFilter
from
nacsos_data.util.academic.openalex
import
query_async
,
SearchResult
from
nacsos_data.models.items
import
AcademicItemModel
,
FullLexisNexisItemModel
,
GenericItemModel
from
nacsos_data.models.openalex.solr
import
SearchField
,
DefType
,
OpType
from
nacsos_data.util.nql
import
NQLQuery
,
NQLFilter
from
server.util.security
import
UserPermissionChecker
,
UserPermissions
from
server.util.logging
import
get_logger
from
server.util.config
import
settings
from
server.data
import
db_engine
if
TYPE_CHECKING
:
from
sqlalchemy.ext.asyncio
import
AsyncSession
# noqa F401
router
=
APIRouter
()
logger
=
get_logger
(
'
nacsos.api.route.search
'
)
...
...
@@ -88,22 +85,34 @@ class QueryResult(BaseModel):
docs
:
list
[
AcademicItemModel
]
|
list
[
FullLexisNexisItemModel
]
|
list
[
GenericItemModel
]
@ensure_session
async
def
_get_query
(
session
:
AsyncSession
,
query
:
NQLFilter
,
project_id
:
str
)
->
NQLQuery
:
project_type
:
ItemType
|
None
=
(
await
session
.
scalar
(
select
(
Project
.
type
).
where
(
Project
.
project_id
==
project_id
)))
if
project_type
is
None
:
raise
KeyError
(
f
'
Found no matching project for
{
project_id
}
. This should NEVER happen!
'
)
return
NQLQuery
(
query
,
project_id
=
str
(
project_id
),
project_type
=
project_type
)
@router.post
(
'
/nql/query
'
,
response_model
=
QueryResult
)
async
def
nql_query
(
query
:
NQLFilter
,
page
:
int
=
1
,
limit
:
int
=
20
,
permissions
:
UserPermissions
=
Depends
(
UserPermissionChecker
(
'
dataset_read
'
)))
->
QueryResult
:
async
with
db_engine
.
session
()
as
session
:
# type: AsyncSession
project_id
=
permissions
.
permissions
.
project_id
project_type
:
ItemType
|
None
=
(
await
session
.
scalar
(
select
(
Project
.
type
).
where
(
Project
.
project_id
==
project_id
)))
if
project_type
is
None
:
raise
KeyError
(
f
'
Found no matching project for
{
project_id
}
. This should NEVER happen!
'
)
nql
=
NQLQuery
(
query
,
project_id
=
str
(
project_id
),
project_type
=
project_type
)
nql
=
await
_get_query
(
session
=
session
,
query
=
query
,
project_id
=
permissions
.
permissions
.
project_id
)
n_docs
=
(
await
session
.
execute
(
func
.
count
(
nql
.
stmt
.
subquery
().
c
.
item_id
))).
scalar
()
docs
=
await
nql
.
results_async
(
session
=
session
,
limit
=
limit
,
offset
=
(
page
-
1
)
*
limit
)
return
QueryResult
(
n_docs
=
n_docs
,
docs
=
docs
)
# type: ignore[arg-type]
@router.post
(
'
/nql/count
'
,
response_model
=
int
)
async
def
nql_query_count
(
query
:
NQLFilter
,
permissions
:
UserPermissions
=
Depends
(
UserPermissionChecker
(
'
dataset_read
'
)))
->
QueryResult
:
async
with
db_engine
.
session
()
as
session
:
# type: AsyncSession
nql
=
await
_get_query
(
session
=
session
,
query
=
query
,
project_id
=
permissions
.
permissions
.
project_id
)
return
(
await
session
.
execute
(
func
.
count
(
nql
.
stmt
.
subquery
().
c
.
item_id
))).
scalar
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment