fix conflict

.idea/.gitignore

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 默认忽略的文件
 /shelf/
 /workspace.xml
@@ -6,3 +7,8 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+=======
+# Default ignored files
+/shelf/
+/workspace.xml
+>>>>>>> fc5a3563ffc1c7e0327baa5ec1f88c9b15852d7c

.idea/MarketingResearch.iml

@@ -2,7 +2,11 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
+<<<<<<< HEAD
     <orderEntry type="jdk" jdkName="Python 3.9 (base)" jdkType="Python SDK" />
+=======
+    <orderEntry type="inheritedJdk" />
+>>>>>>> fc5a3563ffc1c7e0327baa5ec1f88c9b15852d7c
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

.idea/inspectionProfiles/Project_Default.xml

@@ -4,6 +4,7 @@
     <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoredPackages">
         <value>
+<<<<<<< HEAD
           <list size="15">
             <item index="0" class="java.lang.String" itemvalue="python-docx" />
             <item index="1" class="java.lang.String" itemvalue="pyodbc" />
@@ -20,9 +21,61 @@
             <item index="12" class="java.lang.String" itemvalue="PyPDF2" />
             <item index="13" class="java.lang.String" itemvalue="Flask" />
             <item index="14" class="java.lang.String" itemvalue="openai" />
+=======
+          <list size="39">
+            <item index="0" class="java.lang.String" itemvalue="bs4" />
+            <item index="1" class="java.lang.String" itemvalue="scikit-learn" />
+            <item index="2" class="java.lang.String" itemvalue="nltk" />
+            <item index="3" class="java.lang.String" itemvalue="python-dateutil" />
+            <item index="4" class="java.lang.String" itemvalue="azure-functions" />
+            <item index="5" class="java.lang.String" itemvalue="numpy" />
+            <item index="6" class="java.lang.String" itemvalue="requests" />
+            <item index="7" class="java.lang.String" itemvalue="certifi" />
+            <item index="8" class="java.lang.String" itemvalue="soupsieve" />
+            <item index="9" class="java.lang.String" itemvalue="urllib3" />
+            <item index="10" class="java.lang.String" itemvalue="pycountry" />
+            <item index="11" class="java.lang.String" itemvalue="google-cloud-translate" />
+            <item index="12" class="java.lang.String" itemvalue="Cython" />
+            <item index="13" class="java.lang.String" itemvalue="rarfile" />
+            <item index="14" class="java.lang.String" itemvalue="fuzzywuzzy" />
+            <item index="15" class="java.lang.String" itemvalue="beautifulsoup4" />
+            <item index="16" class="java.lang.String" itemvalue="coverage" />
+            <item index="17" class="java.lang.String" itemvalue="scipy" />
+            <item index="18" class="java.lang.String" itemvalue="six" />
+            <item index="19" class="java.lang.String" itemvalue="pyodbc" />
+            <item index="20" class="java.lang.String" itemvalue="chardet" />
+            <item index="21" class="java.lang.String" itemvalue="pandas" />
+            <item index="22" class="java.lang.String" itemvalue="parsel" />
+            <item index="23" class="java.lang.String" itemvalue="pdfplumber" />
+            <item index="24" class="java.lang.String" itemvalue="azure-storage-blob" />
+            <item index="25" class="java.lang.String" itemvalue="pytz" />
+            <item index="26" class="java.lang.String" itemvalue="idna" />
+            <item index="27" class="java.lang.String" itemvalue="openpyxl" />
+            <item index="28" class="java.lang.String" itemvalue="selenium" />
+            <item index="29" class="java.lang.String" itemvalue="elasticsearch7" />
+            <item index="30" class="java.lang.String" itemvalue="lxml" />
+            <item index="31" class="java.lang.String" itemvalue="python-dotenv" />
+            <item index="32" class="java.lang.String" itemvalue="authing" />
+            <item index="33" class="java.lang.String" itemvalue="Flask" />
+            <item index="34" class="java.lang.String" itemvalue="jieba" />
+            <item index="35" class="java.lang.String" itemvalue="azure-cognitiveservices-vision-computervision" />
+            <item index="36" class="java.lang.String" itemvalue="undetected_chromedriver" />
+            <item index="37" class="java.lang.String" itemvalue="freezegun" />
+            <item index="38" class="java.lang.String" itemvalue="xlrd" />
+>>>>>>> fc5a3563ffc1c7e0327baa5ec1f88c9b15852d7c
           </list>
         </value>
       </option>
     </inspection_tool>
+<<<<<<< HEAD
+=======
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N806" />
+        </list>
+      </option>
+    </inspection_tool>
+>>>>>>> fc5a3563ffc1c7e0327baa5ec1f88c9b15852d7c
   </profile>
 </component>

flagged/log.csv

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 code,output,flag,username,timestamp
 000001,,,,2023-03-11 22:22:03.186046
 /Users/jeffrey/code/AI/MarketingResearch/flagged/上传你的图片/tmpbs1j65y7.jpg,/Users/jeffrey/code/AI/MarketingResearch/flagged/图片转换后/tmp7a419ra2.png,,,2023-03-12 16:13:44.396424
+=======
+ho,output,flag,username,timestamp
+,gooD,,,2023-03-12 19:48:15.694109
+>>>>>>> fc5a3563ffc1c7e0327baa5ec1f88c9b15852d7c