From efbd182a5e112d99ae61e8a2231a2ccbb530034a Mon Sep 17 00:00:00 2001
From: huangtao <huangtao@ieemoo.com>
Date: Mon, 4 Jul 2022 15:01:40 +0800
Subject: [PATCH] 7.4

---
 ieemoo-ai-zhanting.py | 24 +++++++++++++++++++++++-
 utils/datasets.py     |  1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ieemoo-ai-zhanting.py b/ieemoo-ai-zhanting.py
index d87fde3..e0b11b2 100644
--- a/ieemoo-ai-zhanting.py
+++ b/ieemoo-ai-zhanting.py
@@ -13,7 +13,7 @@ from torchvision import transforms
 # from models.modeling import VisionTransformer, CONFIGS
 from gevent.pywsgi import WSGIServer
 sys.path.insert(0, ".")
-
+import datetime
 import detect
 import logging.config
 from skywalking import agent, config
@@ -32,6 +32,27 @@ def setup_logging(path):
     return logger
 logger = setup_logging('utils/logging.json')
 
+# obs
+from obs import ObsClient
+obsClient = ObsClient(
+    access_key_id='EVTRGSWY4SYRLVPVSLAA',
+    secret_access_key='u1HLPe2xslZEvel2q0euAQ77TgooUG9JYvVGklWi',
+    server='https://obs.cn-north-1.myhuaweicloud.com'
+)
+bucketName = 'data-storage-9ae1'
+def Obs(image_file): #保存赠品未识别图片至ocrimg
+    objectkey = os.path.basename(image_file)
+    now_time = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+    time1 = now_time[:8]
+    time2 = now_time[8:]
+    objectkey_ = 'zhantingimgs/' + time1 + '/' + time2
+    logger.info(f"obs_imgname:{objectkey_}")
+    if objectkey.split('.')[-1] in ['png', 'jpg']:
+
+        resp = obsClient.putFile(bucketName, objectkey_, image_file)
+        logger.info(f"obs_ocr:{resp}")
+
+
 app = Flask(__name__)
 app.use_reloader=False
 
@@ -90,6 +111,7 @@ def get_isempty():
         # cv2.imwrite("../module/ieemoo-ai-zhanting/imgs/1.jpg",img0)
         pred = detect.detect(opt)
         logger.info(pred)
+        Obs(image_path)
         #print('pred', pred)
         #getdateend = time.time()
         #now_time = datetime.datetime.now()
diff --git a/utils/datasets.py b/utils/datasets.py
index 083b26a..9d55999 100644
--- a/utils/datasets.py
+++ b/utils/datasets.py
@@ -186,6 +186,7 @@ class LoadImages:  # for inference
             mask = im
             masked = cv2.bitwise_or(img0, img0, mask=mask)
             img0 = masked
+            logger.info("orimg mask done!")
             # cv2.namedWindow('mask', cv2.WINDOW_NORMAL)
             # cv2.imshow("mask", img0)
             # cv2.waitKey(0)