Skip to content

P
physical
Commit 1e0342e1 authored by lixiaofang's avatar lixiaofang
Browse files
Options

update face

parent cb572e8e
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 122 deletions
.idea/inspectionProfiles/Project_Default.xml
View file @ 1e0342e1
......@@ -4,8 +4,17 @@
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredPackages">
<value>
<list size="1">
<list size="10">
<item index="0" class="java.lang.String" itemvalue="gm-config==0.1.3" />
<item index="1" class="java.lang.String" itemvalue="gm-logging" />
<item index="2" class="java.lang.String" itemvalue="gm-tracer" />
<item index="3" class="java.lang.String" itemvalue="gm-protocol" />
<item index="4" class="java.lang.String" itemvalue="gm-rpcd" />
<item index="5" class="java.lang.String" itemvalue="helios" />
<item index="6" class="java.lang.String" itemvalue="gm-types" />
<item index="7" class="java.lang.String" itemvalue="gevent" />
<item index="8" class="java.lang.String" itemvalue="alpha-types" />
<item index="9" class="java.lang.String" itemvalue="gm-upload" />
</list>
</value>
</option>
......
.idea/workspace.xml
View file @ 1e0342e1
......@@ -2,13 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="dbf86a46-510b-4304-905e-cf96c87ff27d" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app_conf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app_conf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/views/contrast_similar.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/views/contrast_similar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/models/contrast_similar.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/models/contrast_similar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -20,17 +17,18 @@
<session id="-127591351">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="1" />
<entry key="project.closed" value="2" />
<entry key="project.open.time.0" value="1" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.5" value="1" />
<entry key="project.opened" value="3" />
<entry key="project.opened" value="4" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="json" value="11" />
<entry key="py" value="116" />
<entry key="py" value="122" />
<entry key="txt" value="1" />
<entry key="xml" value="4" />
</counts>
......@@ -39,7 +37,7 @@
<counts>
<entry key="JSON" value="11" />
<entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="116" />
<entry key="Python" value="122" />
<entry key="XML" value="4" />
</counts>
</usages-collector>
......@@ -47,7 +45,7 @@
<counts>
<entry key="dummy" value="9" />
<entry key="json" value="100" />
<entry key="py" value="653" />
<entry key="py" value="657" />
<entry key="xml" value="21" />
</counts>
</usages-collector>
......@@ -55,19 +53,31 @@
<counts>
<entry key="JSON" value="100" />
<entry key="PLAIN_TEXT" value="9" />
<entry key="Python" value="653" />
<entry key="Python" value="657" />
<entry key="XML" value="21" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/physical/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-978">
<caret line="60" column="22" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
<state relative-caret-position="627">
<caret line="164" selection-start-line="164" selection-end-line="165" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding>
<element signature="e#48#76#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -75,8 +85,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
<state relative-caret-position="213">
<caret line="105" column="35" lean-forward="true" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
<folding>
<element signature="e#47#70#0" expanded="true" />
</folding>
......@@ -87,7 +97,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/views/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1036">
<state relative-caret-position="1050">
<caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
<folding>
<element signature="e#24#52#0" expanded="true" />
......@@ -96,45 +106,64 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13">
<caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
<state relative-caret-position="23">
<caret line="12" column="42" lean-forward="true" selection-start-line="12" selection-end-line="13" />
<folding>
<element signature="e#47#79#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="15" column="38" lean-forward="true" selection-start-line="15" selection-end-line="16" />
<state relative-caret-position="-497">
<caret line="70" column="76" lean-forward="true" selection-start-line="70" selection-start-column="76" selection-end-line="70" selection-end-column="76" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/base.py">
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/manager.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3981">
<caret line="484" column="23" selection-start-line="484" selection-start-column="21" selection-end-line="484" selection-end-column="23" />
<state relative-caret-position="-3028">
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/aggregates.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2072">
<caret line="320" selection-start-line="320" selection-end-line="320" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
<state relative-caret-position="435">
<caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6660">
<caret line="484" column="23" selection-start-line="484" selection-start-column="21" selection-end-line="484" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/constants.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -158,6 +187,10 @@
<find>class FaceUserContrastSimilar\(models\.Model\)\:\n</find>
<find>FaceUserContrastSimilar</find>
<find>objects</find>
<find>router</find>
<find>app_</find>
<find>read</find>
<find>django.db</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$</dir>
......@@ -182,16 +215,16 @@
<option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" />
<option value="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" />
<option value="$PROJECT_DIR$/search/views/contrast_similar.py" />
<option value="$PROJECT_DIR$/trans2es/models/contrast_similar.py" />
<option value="$PROJECT_DIR$/app_conf.xml" />
<option value="$PROJECT_DIR$/trans2es/models/contrast_similar.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="29" />
<option name="y" value="23" />
<option name="x" value="-7" />
<option name="y" value="49" />
<option name="width" value="1280" />
<option name="height" value="736" />
<option name="height" value="734" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
......@@ -215,7 +248,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -223,28 +255,6 @@
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
<item name="migrations" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
......@@ -269,10 +279,15 @@
<item name="trans2es" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -315,9 +330,10 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="29" y="23" width="1280" height="736" extended-state="0" />
<frame x="-7" y="49" width="1280" height="734" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20492454" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21604449" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="DB Browser" order="3" weight="0.32962668" />
......@@ -330,7 +346,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.017770598" />
<window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.47987118" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
......@@ -384,15 +400,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/physical/wsgi.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/physical/views.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/physical/celery.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/physical/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -416,13 +423,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="134" column="21" selection-start-line="134" selection-start-column="20" selection-end-line="134" selection-end-column="21" />
<folding>
<element signature="e#278#958#0" />
<element signature="e#1969#2175#0" />
<element signature="e#8364#10837#0" />
<element signature="e#10909#11686#0" />
<element signature="e#11789#15127#0" />
</folding>
</state>
</provider>
</entry>
......@@ -520,13 +520,6 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/manager.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-351">
<caret line="239" column="10" lean-forward="true" selection-start-line="239" selection-start-column="10" selection-end-line="239" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/celebrity.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -586,16 +579,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="107">
<caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding>
<element signature="e#48#76#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/es.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
......@@ -641,26 +624,52 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2072">
<caret line="320" selection-start-line="320" selection-end-line="320" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
<state relative-caret-position="225">
<caret line="15" column="38" selection-start-line="15" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3981">
<state relative-caret-position="6660">
<caret line="484" column="23" selection-start-line="484" selection-start-column="21" selection-end-line="484" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/constants.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/aggregates.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/manager.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3028">
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/physical/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="164" selection-start-line="164" selection-end-line="165" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1036">
<state relative-caret-position="1050">
<caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
<folding>
<element signature="e#24#52#0" expanded="true" />
......@@ -668,34 +677,43 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
<state relative-caret-position="-497">
<caret line="70" column="76" lean-forward="true" selection-start-line="70" selection-start-column="76" selection-end-line="70" selection-end-column="76" />
<folding>
<element signature="e#47#70#0" expanded="true" />
<element signature="e#15#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/physical/settings.py">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-978">
<caret line="60" column="22" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
<state relative-caret-position="213">
<caret line="105" column="35" lean-forward="true" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
<folding>
<element signature="e#47#70#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py">
<entry file="file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13">
<caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
<state relative-caret-position="150">
<caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding>
<element signature="e#48#76#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="15" column="38" lean-forward="true" selection-start-line="15" selection-end-line="16" />
<state relative-caret-position="23">
<caret line="12" column="42" lean-forward="true" selection-start-line="12" selection-end-line="13" />
<folding>
<element signature="e#47#79#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
trans2es/models/contrast_similar.py
View file @ 1e0342e1
......@@ -10,17 +10,16 @@ import datetime
from .topic import Topic
# manager = lambda: models.Manager().db_manager(using='face')
manager = lambda: models.Manager().db_manager(using='face')
class ContrastSimilar(models.Model):
class Meta:
# alisa = 'face'
app_label: 'face'
app_label = 'face'
verbose_name = u"用户脸相似度表"
db_table = "face_user_contrast_similar"
# objects = manager()
objects = manager()
id = models.IntegerField(verbose_name="主键ID", primary_key=True)
is_online = models.BooleanField(verbose_name="是否上线")
is_deleted = models.BooleanField(verbose_name="是否删除")
......
trans2es/type_info.py
View file @ 1e0342e1
......@@ -68,7 +68,7 @@ class TypeInfo(object):
@property
def queryset(self):
return django.db.models.QuerySet(model=self.model, query=self.query)
return django.db.models.QuerySet(model=self.model, query=self.query).using("face")
@property
def pk_blacklist(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment