فهرست منبع

expire time test and video test

ming 3 سال پیش
والد
کامیت
4f7ce92daf
2فایلهای تغییر یافته به همراه9 افزوده شده و 10 حذف شده
  1. 3 5
      OpenshotService/openshot_video_generator.py
  2. 6 5
      api/main.py

+ 3 - 5
OpenshotService/openshot_video_generator.py

@@ -478,11 +478,9 @@ def adjustSub_by_text_similarity(gts_in,gens_raw):
     alls_tag = gts_in + combine2_tag + combine3_tag
 
     for idx in range(len(adjusted)):
-        if adjusted[idx] is not None:
-            match_text = difflib.get_close_matches(adjusted[idx], alls_tag, cutoff=0.1)
-            adjusted[idx] = match_text[0]
-        else:
-            adjusted[idx] = ' '
+        match_text = difflib.get_close_matches(adjusted[idx], alls_tag, cutoff=0.1)
+        adjusted[idx] = match_text[0]
+
     return adjusted
 
 def trim_punctuation(s):

+ 6 - 5
api/main.py

@@ -169,8 +169,9 @@ async def login_for_access_token(request: Request, form_data: OAuth2PasswordRequ
     table = db['users']
     user.token = access_token
     table.update(dict(user), ['username'])
-    access_token = Authorize.create_access_token(subject=user.username)
-    refresh_token = Authorize.create_refresh_token(subject=user.username)
+    expires = timedelta(days=ACCESS_TOKEN_EXPIRE_DAYS)
+    access_token = Authorize.create_access_token(subject=user.username, expires_time=expires)
+    refresh_token = Authorize.create_refresh_token(subject=user.username, expires_time =expires)
     Authorize.set_access_cookies(access_token)
     Authorize.set_refresh_cookies(refresh_token)
     #return templates.TemplateResponse("index.html", {"request": request, "msg": 'Login'})
@@ -481,10 +482,10 @@ def authenticate_user(username: str, password: str):
         return False
     return user
 
-def create_access_token(data: dict, expires_delta: Optional[timedelta] = None):
+def create_access_token(data: dict, expires_delta):
     to_encode = data.copy()
-    if expires_delta:
-        expire = datetime.utcnow() + expires_delta
+    
+    expire = datetime.utcnow() + expires_delta
     to_encode.update({"exp": expire})
     encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt