Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
physical
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴升宇
physical
Commits
d35499cc
Commit
d35499cc
authored
Feb 22, 2019
by
lixiaofang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
dcf5ad0b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
tasks.py
injection/data_sync/tasks.py
+11
-7
settings.py
physical/settings.py
+1
-1
face_user_contrast_similar.py
trans2es/models/face_user_contrast_similar.py
+1
-0
No files found.
injection/data_sync/tasks.py
View file @
d35499cc
...
...
@@ -4,7 +4,7 @@ from celery import shared_task
from
django.conf
import
settings
from
django.core
import
serializers
from
trans2es.type_info
import
get_type_info_map
#from rpc.all import get_rpc_remote_invoker
#
from rpc.all import get_rpc_remote_invoker
from
libs.es
import
ESPerform
import
logging
import
traceback
...
...
@@ -12,6 +12,7 @@ from libs.cache import redis_client
from
trans2es.models.face_user_contrast_similar
import
FaceUserContrastSimilar
import
json
@shared_task
def
write_to_es
(
es_type
,
pk_list
,
use_batch_query_set
=
False
):
try
:
...
...
@@ -33,7 +34,8 @@ def write_to_es(es_type, pk_list, use_batch_query_set=False):
@shared_task
def
sync_face_similar_data_to_redis
():
try
:
result_items
=
FaceUserContrastSimilar
.
objects
.
filter
(
is_online
=
True
,
is_deleted
=
False
)
.
distinct
()
.
values
(
"participant_user_id"
)
.
values_list
(
"participant_user_id"
,
flat
=
True
)
result_items
=
FaceUserContrastSimilar
.
objects
.
filter
(
is_online
=
True
,
is_deleted
=
False
)
.
distinct
()
.
values
(
"participant_user_id"
)
.
values_list
(
"participant_user_id"
,
flat
=
True
)
logging
.
info
(
"duan add,begin sync_face_similar_data_to_redis!"
)
...
...
@@ -41,19 +43,21 @@ def sync_face_similar_data_to_redis():
for
participant_user_id
in
result_items
:
redis_key
=
redis_key_prefix
+
str
(
participant_user_id
)
similar_result_items
=
FaceUserContrastSimilar
.
objects
.
filter
(
is_online
=
True
,
is_deleted
=
False
,
participant_user_id
=
participant_user_id
,
similarity__gt
=
0.4
)
.
order_by
(
"-similarity"
)
.
limit
(
100
)
similar_result_items
=
FaceUserContrastSimilar
.
objects
.
filter
(
is_online
=
True
,
is_deleted
=
False
,
participant_user_id
=
participant_user_id
,
similarity__gt
=
0.3
)
.
order_by
(
"-similarity"
)
item_list
=
list
()
for
item
in
similar_result_items
:
item_list
.
append
(
{
"contrast_user_id"
:
item
.
contrast_user_id
,
"similarity"
:
item
.
similarity
"contrast_user_id"
:
item
.
contrast_user_id
,
"similarity"
:
item
.
similarity
}
)
redis_client
.
set
(
redis_key
,
json
.
dumps
(
item_list
))
redis_client
.
set
(
redis_key
,
json
.
dumps
(
item_list
))
logging
.
info
(
"duan add,participant_user_id:
%
d set data done!"
%
participant_user_id
)
except
:
logging
.
error
(
"catch exception,err_msg:
%
s"
%
traceback
.
format_exc
())
physical/settings.py
View file @
d35499cc
...
...
@@ -72,7 +72,7 @@ INSTALLED_APPS = (
CELERYBEAT_SCHEDULE
=
{
'sync_face_similar_data_to_redis'
:
{
'task'
:
'injection.data_sync.tasks.sync_face_similar_data_to_redis'
,
'schedule'
:
timedelta
(
seconds
=
1
2
0
),
'schedule'
:
timedelta
(
seconds
=
10
),
'args'
:
()
},
}
...
...
trans2es/models/face_user_contrast_similar.py
View file @
d35499cc
...
...
@@ -24,3 +24,4 @@ class FaceUserContrastSimilar(models.Model):
similarity
=
models
.
FloatField
(
verbose_name
=
u'相似度'
,
default
=
0
)
create_time
=
models
.
DateTimeField
(
verbose_name
=
u'创建时间'
,
default
=
datetime
.
datetime
.
fromtimestamp
(
0
))
update_time
=
models
.
DateTimeField
(
verbose_name
=
u'更新时间'
,
default
=
datetime
.
datetime
.
fromtimestamp
(
0
))
contrast_user_id
=
models
.
IntegerField
(
verbose_name
=
u'对照者用户ID'
)
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