Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
mentha
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
1
Merge Requests
1
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
rank
mentha
Commits
fb7dd4d3
Commit
fb7dd4d3
authored
Feb 05, 2021
by
李小芳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get_highlight_v2
parent
506e0f85
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
10 deletions
+33
-10
transfer.py
data_sync/answer/transfer.py
+5
-5
transfer.py
data_sync/tractate/transfer.py
+6
-5
answer.py
qa/models/answer.py
+11
-0
tractate.py
talos/models/tractate/tractate.py
+11
-0
No files found.
data_sync/answer/transfer.py
View file @
fb7dd4d3
...
...
@@ -203,16 +203,16 @@ def get_answers(pks):
# 首页精选增加内容分类 明星列表和网红列表
tagv4
=
answer
.
get_answer_tagv4_names
(
answer_id
=
answer
.
id
)
if
tagv4
:
tags_info
=
answer
.
get_
answer_tag
(
tagv4
)
tags_info
=
answer
.
get_
om_answer_tags_info
(
ids
=
tagv4
)
item
[
'selected_stars'
]
=
[]
item
[
'selected_internet_celebrity'
]
=
[]
all_tags
=
[]
for
tag
in
tags_info
:
all_tags
.
append
(
tag
.
get
(
"id"
,
None
))
if
tag
.
get
(
"
id"
,
0
)
in
(
15928
,
10682
)
:
item
[
'selected_stars'
]
.
append
(
tag
.
get
(
"
tag_
name"
,
None
))
elif
tag
.
get
(
"
id"
,
0
)
in
(
15930
,
10683
)
:
item
[
'selected_internet_celebrity'
]
.
append
(
tag
.
get
(
"
tag_
name"
,
None
))
if
tag
.
get
(
"
tag_type"
,
0
)
==
TAG_TYPE
.
STAR
:
item
[
'selected_stars'
]
.
append
(
tag
.
get
(
"name"
,
None
))
elif
tag
.
get
(
"
tag_type"
,
0
)
==
TAG_TYPE
.
INFLUENCER
:
item
[
'selected_internet_celebrity'
]
.
append
(
tag
.
get
(
"name"
,
None
))
else
:
pass
if
tag
.
get
(
"id"
)
==
14288
:
...
...
data_sync/tractate/transfer.py
View file @
fb7dd4d3
...
...
@@ -254,20 +254,21 @@ def get_tractate(pks):
# 首页精选增加内容分类 明星列表和网红列表
tagv4
=
tractate
.
get_tractate_tagv4_names
(
tractate_id
=
tractate
.
id
)
if
tagv4
:
tags_info
=
tractate
.
get_
tag
(
list
(
tagv4
))
tags_info
=
tractate
.
get_
om_tags_info
(
ids
=
tagv4
);
item
[
'selected_stars'
]
=
[]
item
[
'selected_internet_celebrity'
]
=
[]
all_tags
=
[]
for
tag
in
tags_info
:
all_tags
.
append
(
tag
.
get
(
"id"
,
None
))
if
tag
.
get
(
"
id"
,
0
)
in
(
15928
,
10682
)
:
item
[
'selected_stars'
]
.
append
(
tag
.
get
(
"
tag_
name"
,
None
))
elif
tag
.
get
(
"
id"
,
0
)
in
(
15930
,
10683
)
:
item
[
'selected_internet_celebrity'
]
.
append
(
tag
.
get
(
"
tag_
name"
,
None
))
if
tag
.
get
(
"
tag_type"
,
0
)
==
TAG_TYPE
.
STAR
:
item
[
'selected_stars'
]
.
append
(
tag
.
get
(
"name"
,
None
))
elif
tag
.
get
(
"
tag_type"
,
0
)
==
TAG_TYPE
.
INFLUENCER
:
item
[
'selected_internet_celebrity'
]
.
append
(
tag
.
get
(
"name"
,
None
))
else
:
pass
if
tag
.
get
(
"id"
)
==
14288
:
item
[
'operators_add_tags'
]
.
append
(
14288
)
if
15928
in
all_tags
:
item
[
'selected_content_type'
]
=
SELECTED_CONTENT_TYPE
.
BEAUTY_STAR
elif
10682
in
all_tags
:
...
...
qa/models/answer.py
View file @
fb7dd4d3
...
...
@@ -29,6 +29,7 @@ from gm_types.mimas import (
from
gm_types.mimas.qa
import
CONTENT_CLASS
,
VIDEO_SOURCE_TYPE
from
gm_types.push
import
AUTOMATED_PUSH
from
gm_upload
import
ImgUrlField
,
IMG_TYPE
from
talos.rpc
import
get_current_rpc_invoker
from
talos.services
import
UserConvertService
from
talos.services.tag_v3
import
TagV3Service
...
...
@@ -1124,6 +1125,16 @@ class Answer(models.Model):
logging
.
error
(
"catch exception,err_msg:
%
s"
%
traceback
.
format_exc
())
return
[]
def
get_om_answer_tags_info
(
self
,
ids
):
r
=
get_current_rpc_invoker
()
try
:
res_list
=
[]
result
=
r
[
'pims/catalog/usertags/ids2tag'
](
ids
=
ids
)
.
unwrap
()
res_list
=
result
.
get
(
"result"
,
[])
except
Exception
:
return
[]
return
res_list
class
SendAnswer
(
models
.
Model
):
class
Meta
:
...
...
talos/models/tractate/tractate.py
View file @
fb7dd4d3
...
...
@@ -32,6 +32,7 @@ from gm_types.gaia import (
from
talos.cache.base
import
tractate_pv_cache
,
tractate_favor_count_cache
,
tractate_vote_count_cache
from
utils.rpc
import
RPCMixin
from
utils.pic
import
PictureTools
from
talos.rpc
import
get_current_rpc_invoker
doris_redis_client
=
redis
.
StrictRedis
.
from_url
(
settings
.
REDIS_URL
)
...
...
@@ -323,6 +324,16 @@ class Tractate(models.Model):
logging
.
error
(
"catch exception,err_msg:
%
s"
%
traceback
.
format_exc
())
return
[]
def
get_om_tags_info
(
self
,
ids
):
r
=
get_current_rpc_invoker
()
try
:
res_list
=
[]
result
=
r
[
'pims/catalog/usertags/ids2tag'
](
ids
=
ids
)
.
unwrap
()
res_list
=
result
.
get
(
"result"
,
[])
except
Exception
:
return
[]
return
res_list
def
get_tag_names
(
self
,
tag_list
):
try
:
association_tags_id_list
=
list
()
...
...
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