style(*.py): use Black as python code formatter

use Black as python code formatter

Signed-off-by: Ching <loooching@gmail.com>

.vscode/settings.json

@@ -1,2 +1,13 @@
 {
+  "python.formatting.provider": "black",
+  "python.formatting.blackArgs": [
+    "-S",
+    "-C",
+    "-l 120"
+  ],
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true,
+  "editor.rulers": [
+    120
+  ]
 }

core/pagination.py

@@ -2,6 +2,7 @@
 from rest_framework import pagination
 from rest_framework.response import Response
 
+
 class PagePaginationWithPageCount(pagination.PageNumberPagination):
     page_size_query_param = 'page_size'
 
@@ -9,5 +10,3 @@ class PagePaginationWithPageCount(pagination.PageNumberPagination):
         response = super().get_paginated_response(data)
         response.data['page_count'] = self.page.paginator.num_pages
         return response
-
-

dsite/settings_default.py

@@ -37,14 +37,11 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-
-
     # third party
     'corsheaders',
     'rest_framework',
     'rest_framework.authtoken',
     'django_filters',
-
     # user apps
     'timer',
     'recipe',
@@ -74,9 +71,9 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-            ],
+            ]
-        },
         },
+    }
 ]
 
 WSGI_APPLICATION = 'dsite.wsgi.application'
@@ -85,30 +82,17 @@ WSGI_APPLICATION = 'dsite.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
-DATABASES = {
+DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3')}}
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    }
-}
 
 
 # Password validation
 # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-    {
+    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator'},
-    },
+    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
-    {
+    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
 ]
 
 
@@ -140,11 +124,10 @@ REST_FRAMEWORK = {
     # 'DEFAULT_PERMISSION_CLASSES': [
     #     'rest_framework.permissions.IsAuthenticatedOrReadOnly'
     # ],
-
     # 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
     'DEFAULT_PAGINATION_CLASS': 'core.pagination.PagePaginationWithPageCount',
     'PAGE_SIZE': 10,
-    'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']
+    'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'],
 }
 
 # CORS

recipe/migrations/0001_initial.py

@@ -7,8 +7,7 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
+    dependencies = []
-    ]
 
     operations = [
         migrations.CreateModel(
@@ -21,5 +20,5 @@ class Migration(migrations.Migration):
                 ('rate', models.IntegerField(default=0)),
                 ('difficulty', models.IntegerField(default=0)),
             ],
-        ),
+        )
     ]

recipe/migrations/0002_auto_20211002_1926.py

@@ -5,15 +5,11 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
 
-    dependencies = [
+    dependencies = [('recipe', '0001_initial')]
-        ('recipe', '0001_initial'),
-    ]
 
     operations = [
         migrations.AlterField(
-            model_name='recipe',
+            model_name='recipe', name='recipe_type', field=models.CharField(default='meat', max_length=32)
-            name='recipe_type',
-            field=models.CharField(default='meat', max_length=32),
         ),
         migrations.CreateModel(
             name='DailyRecipe',

recipe/models.py

@@ -5,26 +5,18 @@ import datetime
 from utils import const
 import utils
 
+
 class Recipe(models.Model):
     name = models.CharField(max_length=128)
-  recipe_type = models.CharField(max_length=32,
+    recipe_type = models.CharField(max_length=32, default=const.RECIPE_TYPE_MEAT)
-                                 default=const.RECIPE_TYPE_MEAT)
     note = models.TextField(null=True)
     rate = models.IntegerField(default=0)
     difficulty = models.IntegerField(default=0)
 
     def serialize(self, verbose=False):
-    data = {
+        data = {'id': self.id, 'name': self.name, 'recipe_type': self.recipe_type}
-      'id': self.id,
-      'name': self.name,
-      'recipe_type': self.recipe_type,
-    }
         if verbose:
-      data.update({
+            data.update({'difficulty': self.difficulty, 'rate': self.rate, 'note': self.note})
-        'difficulty': self.difficulty,
-        'rate': self.rate,
-        'note': self.note,
-      })
 
         return data
 
@@ -62,12 +54,7 @@ class Recipe(models.Model):
                 difficulty = 0
         else:
             difficulty = 0
-    recipe = cls.objects.create(
+        recipe = cls.objects.create(name=name, recipe_type=recipe_type, rate=rate, difficulty=difficulty)
-      name=name,
-      recipe_type=recipe_type,
-      rate=rate,
-      difficulty=difficulty
-    )
         return recipe
 
     @property
@@ -91,50 +78,32 @@ class Recipe(models.Model):
     def construct_lart_card(self):
 
         data = {
-      "config": {
+            "config": {"wide_screen_mode": True},
-        "wide_screen_mode": True
+            "header": {"title": {"tag": "plain_text", "content": self.name}, "template": "blue"},
-      },
-      "header": {
-        "title": {
-          "tag": "plain_text",
-          "content": self.name,
-        },
-        "template": "blue"
-      },
             "elements": [
                 {
                     "tag": "markdown",
-          "content": "**类型**：%s\n**评分**：%s\n**难度**：%s" % (
+                    "content": "**类型**：%s\n**评分**：%s\n**难度**：%s"
-            self.display_recipe_type, self.display_rate, self.display_difficult)
+                    % (self.display_recipe_type, self.display_rate, self.display_difficult),
                 },
                 {
                     "tag": "action",
                     "actions": [
                         {
                             "tag": "button",
-              "text": {
+                            "text": {"tag": "plain_text", "content": "查看"},
-                "tag": "plain_text",
-                "content": "查看"
-              },
                             "multi_url": {
                                 "url": "https://recipe.tunpok.com/recipe/%s" % self.id,
                                 "android_url": "https://recipe.tunpok.com/recipe-mobile/recipe/%s" % self.id,
                                 "ios_url": "https://recipe.tunpok.com/recipe-mobile/recipe/%s" % self.id,
-                "pc_url": "https://recipe.tunpok.com/recipe/%s" % self.id
+                                "pc_url": "https://recipe.tunpok.com/recipe/%s" % self.id,
                             },
-              "type": "primary"
+                            "type": "primary",
                         },
-            {
+                        {"tag": "button", "text": {"tag": "plain_text", "content": "删除"}, "type": "danger"},
-              "tag": "button",
+                    ],
-              "text": {
-                "tag": "plain_text",
-                "content": "删除"
                 },
-              "type": "danger"
+            ],
-            }
-          ]
-        }
-      ]
         }
         return data
 
@@ -142,9 +111,7 @@ class Recipe(models.Model):
 class DailyRecipe(models.Model):
     recipes = models.ManyToManyField(Recipe)
     date = models.DateField()
-  meal_type = models.CharField(
+    meal_type = models.CharField(max_length=32, default=const.DAILY_RECIPE_MEAL_TYPE_SUPPER)
-    max_length=32,
-    default=const.DAILY_RECIPE_MEAL_TYPE_SUPPER,)
 
     def generate_recipe(self, prev_recipes=None, ignore_prev=False):
         if not prev_recipes:
@@ -156,11 +123,9 @@ class DailyRecipe(models.Model):
         retry = 5
 
         # meat
-    for x in range(0,2):
+        for x in range(0, 2):
             while True:
-        recipe = Recipe.objects.filter(
+                recipe = Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_MEAT).order_by('?').first()
-          recipe_type=const.RECIPE_TYPE_MEAT,
-        ).order_by('?').first()
                 if recipe and recipe.id not in recipes and recipe.id not in prev_recipes:
                     recipes.append(recipe.id)
                     break
@@ -173,9 +138,7 @@ class DailyRecipe(models.Model):
         # vegetable
         for x in range(0, 1):
             while True:
-        recipe = Recipe.objects.filter(
+                recipe = Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_VEGETABLE).order_by('?').first()
-          recipe_type=const.RECIPE_TYPE_VEGETABLE,
-        ).order_by('?').first()
                 if recipe and recipe.id not in recipes and recipe.id not in prev_recipes:
                     recipes.append(recipe.id)
                     break
@@ -186,10 +149,8 @@ class DailyRecipe(models.Model):
                     break
 
         # soup
-    if random.randint(0,2):
+        if random.randint(0, 2):
-      recipe = Recipe.objects.filter(
+            recipe = Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_SOUP).order_by('?').first()
-        recipe_type=const.RECIPE_TYPE_SOUP,
-      ).order_by('?').first()
             # if recipe not in recipes and recipe not in prev_recipes:
             if recipe:
                 recipes.append(recipe.id)
@@ -197,19 +158,13 @@ class DailyRecipe(models.Model):
         self.recipes.set(Recipe.objects.filter(id__in=recipes))
 
     def serialize(self):
-    data = {
+        data = {const.RECIPE_TYPE_MEAT: [], const.RECIPE_TYPE_VEGETABLE: [], const.RECIPE_TYPE_SOUP: []}
-      const.RECIPE_TYPE_MEAT: [],
-      const.RECIPE_TYPE_VEGETABLE: [],
-      const.RECIPE_TYPE_SOUP: [],
-    }
         for key_, value_ in data.items():
-      for recipe in self.recipes.filter(
+            for recipe in self.recipes.filter(recipe_type=key_).order_by('id'):
-          recipe_type=key_).order_by('id'):
                 value_.append(recipe.serialize())
 
         date = now()
-    date = date.replace(year=self.date.year, month=self.date.month,
+        date = date.replace(year=self.date.year, month=self.date.month, day=self.date.day, hour=0, minute=0)
-                        day=self.date.day, hour=0, minute=0)
         data['date'] = utils.timestamp_of(utils.day_start(date))
         data['id'] = self.id
         return data
@@ -219,10 +174,7 @@ class DailyRecipe(models.Model):
         today = localtime()
         week_start = (today - datetime.timedelta(days=today.weekday())).date()
         week_end = week_start + datetime.timedelta(days=6)
-    daily_recipes = cls.objects.filter(
+        daily_recipes = cls.objects.filter(date__gte=week_start, date__lte=week_end).order_by('date')
-      date__gte=week_start,
-      date__lte=week_end,
-    ).order_by('date')
         data = [{}] * (7 - len(daily_recipes))
 
         for daily_recipe in daily_recipes:

recipe/serializers.py

@@ -4,15 +4,16 @@ from rest_framework import serializers
 
 import recipe.models
 
+
 class RecipeSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(read_only=True)
+
     class Meta:
         model = recipe.models.Recipe
         fields = '__all__'
 
 
 class WeekRecipeSerializer(serializers.ModelSerializer):
-
     class Meta:
         model = recipe.models.DailyRecipe
         fields = '__all__'
@@ -21,6 +22,7 @@ class WeekRecipeSerializer(serializers.ModelSerializer):
 class DailyRecipeSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(read_only=True)
     recipes = RecipeSerializer(many=True)
+
     class Meta:
         model = recipe.models.DailyRecipe
         fields = '__all__'

recipe/urls.py

@@ -1,4 +1,5 @@
 from django.conf.urls import include, url
+
 # from django.core.urlresolvers import reverse
 from django.urls import path
 from rest_framework import routers
@@ -11,6 +12,5 @@ urlpatterns = [
     url(r'^recipe/(?P<pk>\d+)$', views.RecipeAPI.as_view(), name='recipe-detail'),
     url(r'^recipe/$', views.RecipeListAPI.as_view()),
     url(r'^week-recipe/$', views.WeekRecipeListAPI.as_view()),
-    url(r'^daily-recipe/(?P<pk>\d+)$', views.DailyRecipeAPI.as_view(),
+    url(r'^daily-recipe/(?P<pk>\d+)$', views.DailyRecipeAPI.as_view(), name='dailyrecipe-detail'),
-        name='dailyrecipe-detail'),
 ]

recipe/views.py

@@ -11,6 +11,7 @@ import recipe.models
 import recipe.serializers
 from utils import const
 
+
 class RecipeAPI(rest_framework.generics.RetrieveUpdateAPIView):
 
     # authentication_classes = (authentication.TokenAuthentication,
@@ -21,8 +22,7 @@ class RecipeAPI(rest_framework.generics.RetrieveUpdateAPIView):
     serializer_class = recipe.serializers.RecipeSerializer
 
 
-class RecipeListAPI(rest_framework.generics.ListAPIView,
+class RecipeListAPI(rest_framework.generics.ListAPIView, rest_framework.generics.CreateAPIView):
-                    rest_framework.generics.CreateAPIView):
 
     # authentication_classes = (authentication.TokenAuthentication,
     #                           authentication.SessionAuthentication,
@@ -37,8 +37,7 @@ class RecipeListAPI(rest_framework.generics.ListAPIView,
     }
 
 
-class WeekRecipeListAPI(rest_framework.generics.ListAPIView,
+class WeekRecipeListAPI(rest_framework.generics.ListAPIView, rest_framework.generics.CreateAPIView):
-                        rest_framework.generics.CreateAPIView):
 
     queryset = recipe.models.DailyRecipe.objects.all()
     serializer_class = recipe.serializers.WeekRecipeSerializer
@@ -47,14 +46,11 @@ class WeekRecipeListAPI(rest_framework.generics.ListAPIView,
         # Monday == 0 ... Sunday == 6
         today = localtime()
         recipes = []
-    for x in range(0, 7-today.weekday()):
+        for x in range(0, 7 - today.weekday()):
-      daily_recipe, __ = recipe.models.DailyRecipe.objects.get_or_create(
+            daily_recipe, __ = recipe.models.DailyRecipe.objects.get_or_create(date=today + datetime.timedelta(days=x))
-        date=today + datetime.timedelta(days=x)
-      )
             daily_recipe.generate_recipe(recipes)
             recipes.extend(daily_recipe.recipes.values_list('id', flat=True))
-    return Response(recipe.models.DailyRecipe.get_week_recipe_data(),
+        return Response(recipe.models.DailyRecipe.get_week_recipe_data(), status=status.HTTP_201_CREATED, headers={})
-                    status=status.HTTP_201_CREATED, headers={})
 
     def get(self, request, *args, **kwargs):
         data = recipe.models.DailyRecipe.get_week_recipe_data()
@@ -69,15 +65,12 @@ class DailyRecipeAPI(rest_framework.generics.RetrieveUpdateAPIView):
     def post(self, request, *args, **kwargs):
         daily_recipe = recipe.models.DailyRecipe.objects.get(id=kwargs['pk'])
         daily_recipe.generate_recipe()
-    return Response(daily_recipe.serialize(), status=status.HTTP_201_CREATED,
+        return Response(daily_recipe.serialize(), status=status.HTTP_201_CREATED, headers={})
-                    headers={})
 
     def put(self, request, *args, **kwargs):
         daily_recipe = recipe.models.DailyRecipe.objects.get(id=kwargs['pk'])
-    recipes = request.data.get('meat',[])
+        recipes = request.data.get('meat', [])
         recipes.extend(request.data.get('vegetable', []))
         recipes.extend(request.data.get('soup', []))
-    daily_recipe.recipes.set(recipe.models.Recipe.objects.filter(
+        daily_recipe.recipes.set(recipe.models.Recipe.objects.filter(id__in=recipes))
-      id__in=recipes))
+        return Response(daily_recipe.serialize(), status=status.HTTP_201_CREATED, headers={})
-    return Response(daily_recipe.serialize(), status=status.HTTP_201_CREATED,
-                    headers={})

scripts/dodo.py

@@ -2,10 +2,12 @@
 # --coding:utf-8--
 import os
 import sys
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dsite.settings")
 sys.path.insert(0, '../')
 sys.path.insert(0, './')
 from django.core.wsgi import get_wsgi_application
+
 get_wsgi_application()
 
 from http.server import BaseHTTPRequestHandler, HTTPServer
@@ -36,48 +38,46 @@ KEDAI_ID = '107263380636355825'
 logging.basicConfig(filename='/root/develop/log/dodo.log', level=logging.INFO)
 logger = logging.getLogger('/root/develop/log/dodo.log')
 
-mastodon_cli = Mastodon(
+mastodon_cli = Mastodon(access_token='Ug_bUMWCk3RLamOnqYIytmeB0nO6aNfjdmf06mAj2bE', api_base_url='https://nofan.xyz')
-  access_token = 'Ug_bUMWCk3RLamOnqYIytmeB0nO6aNfjdmf06mAj2bE',
-  api_base_url = 'https://nofan.xyz'
-)
 
 pool = redis.ConnectionPool(host='localhost', port=6379, decode_responses=True)
 redis_cli = redis.Redis(host='localhost', port=6379, decode_responses=True)
 
+
 class AESCipher(object):
     def __init__(self, key):
         self.bs = AES.block_size
-        self.key=hashlib.sha256(AESCipher.str_to_bytes(key)).digest()
+        self.key = hashlib.sha256(AESCipher.str_to_bytes(key)).digest()
+
     @staticmethod
     def str_to_bytes(data):
         u_type = type(b"".decode('utf8'))
         if isinstance(data, u_type):
             return data.encode('utf8')
         return data
+
     @staticmethod
     def _unpad(s):
-        return s[:-ord(s[len(s) - 1:])]
+        return s[: -ord(s[len(s) - 1 :])]
+
     def decrypt(self, enc):
-        iv = enc[:AES.block_size]
+        iv = enc[: AES.block_size]
         cipher = AES.new(self.key, AES.MODE_CBC, iv)
-        return  self._unpad(cipher.decrypt(enc[AES.block_size:]))
+        return self._unpad(cipher.decrypt(enc[AES.block_size :]))
+
     def decrypt_string(self, enc):
         enc = base64.b64decode(enc)
         return self.decrypt(enc).decode('utf8')
 
+
 def get_tenant_access_token():  # 获取token
     token = redis_cli.get('tenant_access_token_%s' % APP_ID)
     if token:
         return token
 
     url = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal/"
-    headers = {
+    headers = {"Content-Type": "application/json"}
-        "Content-Type": "application/json"
+    req_body = {"app_id": APP_ID, "app_secret": APP_SECRET}
-    }
-    req_body = {
-        "app_id": APP_ID,
-        "app_secret": APP_SECRET
-    }
 
     data = bytes(json.dumps(req_body), encoding='utf8')
     req = request.Request(url=url, data=data, headers=headers, method='POST')
@@ -94,29 +94,23 @@ def get_tenant_access_token():  # 获取token
         logger.error("get tenant_access_token error, code =%s", code)
         return ""
     token = rsp_dict.get("tenant_access_token", "")
-    redis_cli.set('tenant_access_token_%s' % APP_ID,
+    redis_cli.set('tenant_access_token_%s' % APP_ID, rsp_dict.get("tenant_access_token", ""), ex=60 * 30)
-                  rsp_dict.get("tenant_access_token", ""),
-                  ex=60*30)
 
     return token
 
+
 def get_group_name(chat_id):
     group_name = redis_cli.get('group_name_%s' % chat_id)
     if not group_name:
         url = "https://open.feishu.cn/open-apis/im/v1/chats/"
-    headers = {
+        headers = {"Content-Type": "application/json", "Authorization": "Bearer " + get_tenant_access_token()}
-        "Content-Type": "application/json",
-        "Authorization": "Bearer " + get_tenant_access_token()
-    }
         try:
-      resp = requests.get(url+chat_id, headers=headers)
+            resp = requests.get(url + chat_id, headers=headers)
             resp_data = resp.json()
             code = resp_data.get("code", -1)
             if code == 0:
                 group_name = resp_data.get('data', {}).get('name')
-        redis_cli.set('group_name_%s' % chat_id,
+                redis_cli.set('group_name_%s' % chat_id, group_name, ex=60 * 60 * 24)
-                      group_name,
-                      ex=60*60*24)
         except:
             # todo: log
             return
@@ -195,11 +189,10 @@ class RequestHandler(BaseHTTPRequestHandler):
                     group_name = get_group_name(msg.get("chat_id"))
                     text = '%s #%s' % (text, group_name)
             else:
-                open_id = {"open_id": event.get("sender", {}).get(
+                open_id = {"open_id": event.get("sender", {}).get('sender_id', {}).get('open_id')}
-                    'sender_id', {}).get('open_id')}
             self.response("")
             if orig_text.startswith('/'):
-              redis_cli.set(event_id, int(time.time()), ex=60*60*7)
+                redis_cli.set(event_id, int(time.time()), ex=60 * 60 * 7)
                 if orig_text not in ['/last', '/del']:
                     flag = False
                     for action_ in ['/deploy ', '/菜谱 ']:
@@ -213,8 +206,7 @@ class RequestHandler(BaseHTTPRequestHandler):
                     try:
                         statuses = mastodon_cli.account_statuses(KEDAI_ID, limit=1)
                         s_text = BeautifulSoup(statuses[0]['content'], 'html.parser')
-                  self.msg_compoment(access_token, open_id,
+                        self.msg_compoment(access_token, open_id, s_text.get_text(''))
-                                     s_text.get_text(''))
                     except Exception as exc:
                         logger.error('operation error: %s', str(exc))
                 elif orig_text == '/del':
@@ -222,8 +214,7 @@ class RequestHandler(BaseHTTPRequestHandler):
                         statuses = mastodon_cli.account_statuses(KEDAI_ID, limit=1)
                         mastodon_cli.status_delete(statuses[0]['id'])
                         s_text = BeautifulSoup(statuses[0]['content'], 'html.parser')
-                  self.msg_compoment(access_token, open_id,
+                        self.msg_compoment(access_token, open_id, '已删除： ' + s_text.get_text(''))
-                                     '已删除： ' + s_text.get_text(''))
                     except Exception as exc:
                         logger.error('operation error: %s', str(exc))
                 elif orig_text.startswith('/deploy '):
@@ -239,9 +230,13 @@ class RequestHandler(BaseHTTPRequestHandler):
                     content = orig_text.split('/菜谱 ')[1]
                     recipe_ = recipe.models.Recipe.create_from_str(content)
                     if recipe_:
-                      self.msg_compoment(access_token, open_id, None,
+                        self.msg_compoment(
+                            access_token,
+                            open_id,
+                            None,
                             const.LARK_WEBHOOK_MSG_TYPE_INTERACTIVE,
-                                         recipe_.construct_lart_card())
+                            recipe_.construct_lart_card(),
+                        )
                     else:
                         self.msg_compoment(access_token, open_id, '⚠️ 创建失败 ⚠️')
                 return
@@ -250,11 +245,16 @@ class RequestHandler(BaseHTTPRequestHandler):
                 toot_resp = mastodon_cli.status_post(text)
                 if toot_resp.get('id'):
                     self.msg_compoment(access_token, open_id, '📟 dodo 📟')
-                redis_cli.set(event_id, int(time.time()), ex=60*60*7)
+                    redis_cli.set(event_id, int(time.time()), ex=60 * 60 * 7)
                 else:
-                self.msg_compoment(access_token, open_id, """⚠️ didi ⚠️
+                    self.msg_compoment(
+                        access_token,
+                        open_id,
+                        """⚠️ didi ⚠️
                 %s
-                """ % json.loads(toot_resp))
+                """
+                        % json.loads(toot_resp),
+                    )
             except Exception as exc:
                 logger.error('send toot error: %s', str(exc))
 
@@ -271,15 +271,10 @@ class RequestHandler(BaseHTTPRequestHandler):
 
     def send_message(self, token, open_id, text, msg_type=None, content=None):
         url = "https://open.feishu.cn/open-apis/message/v4/send/"
-        headers = {
+        headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token}
-            "Content-Type": "application/json",
-            "Authorization": "Bearer " + token
-        }
         if not msg_type:
             msg_type = const.LARK_WEBHOOK_MSG_TYPE_TEXT
-        req_body = {
+        req_body = {"msg_type": msg_type}
-            "msg_type": msg_type
-        }
         if msg_type == const.LARK_WEBHOOK_MSG_TYPE_TEXT:
             req_body['content'] = {'text': text}
         elif msg_type == const.LARK_WEBHOOK_MSG_TYPE_INTERACTIVE:
@@ -299,13 +294,12 @@ class RequestHandler(BaseHTTPRequestHandler):
         rsp_dict = json.loads(rsp_body)
         code = rsp_dict.get("code", -1)
         if code != 0:
-            logger.error("send message error, code = %s, msg =%s",
+            logger.error("send message error, code = %s, msg =%s", code, rsp_dict.get("msg", ""))
-                         code,
-                         rsp_dict.get("msg", ""))
 
     def msg_compoment(self, token, open_id, text, msg_type=None, content=None):
         self.send_message(token, open_id, text, msg_type, content)
 
+
 def run():
     port = 5000
     server_address = ('', port)

timer/forms.py

@@ -12,7 +12,6 @@ class OfficeHoursForm(forms.ModelForm):
         self.user = kwargs.pop('user')
         return super().__init__(*args, **kwargs)
 
-
     def full_clean(self):
         if not self.user.is_authenticated:
             raise forms.ValidationError('Invalid User.')
@@ -22,9 +21,6 @@ class OfficeHoursForm(forms.ModelForm):
         begins_at = timer.models.OfficeHours.parse_time_str(self.data.get('begins_at'))
         user = self.user
         obj = timer.models.OfficeHours.objects.create(
-      user=user,
+            user=user, begins_at=begins_at, ends_at=timer.models.OfficeHours.get_ends_at(begins_at)
-      begins_at=begins_at,
+        )
-      ends_at=timer.models.OfficeHours.get_ends_at(begins_at))
         return obj
-
-

timer/migrations/0001_initial.py

@@ -9,9 +9,7 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
+    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
 
     operations = [
         migrations.CreateModel(
@@ -22,5 +20,5 @@ class Migration(migrations.Migration):
                 ('ends_at', models.DateTimeField()),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
-        ),
+        )
     ]

timer/urls.py

@@ -1,4 +1,5 @@
 from django.conf.urls import include, url
+
 # from django.core.urlresolvers import reverse
 from django.urls import path
 from rest_framework import routers

timer/views.py

@@ -19,9 +19,11 @@ from django.urls import reverse
 
 class OfficeHoursAPI(CreateAPIView):
 
-  authentication_classes = (authentication.TokenAuthentication,
+    authentication_classes = (
+        authentication.TokenAuthentication,
         authentication.SessionAuthentication,
-                            authentication.BasicAuthentication)
+        authentication.BasicAuthentication,
+    )
     permission_classes = (permissions.IsAuthenticated,)
 
     queryset = timer.models.OfficeHours.objects.all()
@@ -34,16 +36,12 @@ class OfficeHoursAPI(CreateAPIView):
             begins_at = timer.models.OfficeHours.parse_time_str(begins_at)
             ends_at = timer.models.OfficeHours.get_ends_at(begins_at)
             oh, __ = timer.models.OfficeHours.objects.get_or_create(
-        begins_at=begins_at,
+                begins_at=begins_at, ends_at=ends_at, user=request.user
-        ends_at=ends_at,
+            )
-        user=request.user)
         except ValueError:
             raise
         oh.refresh_from_db()
-    resp_data = {
+        resp_data = {'begins_at': oh.get_begins_at_str, 'ends_at': oh.get_ends_at_str}
-      'begins_at': oh.get_begins_at_str,
-      'ends_at': oh.get_ends_at_str,
-    }
 
         return Response(resp_data, status=status.HTTP_201_CREATED)
 

utils/__init__.py

@@ -51,7 +51,7 @@ def midnight_of(d):
 
 
 def day_start(date):
-  """ 返回 date 这天的开始时间
+    """返回 date 这天的开始时间
 
     Args:
       date: `Datetime` 对象
@@ -59,12 +59,11 @@ def day_start(date):
     Returns:
       返回 date 这天的开始时间（0 点），`Datetime` 对象
     """
-  return timezone.localtime(date).replace(hour=0, minute=0, second=0,
+    return timezone.localtime(date).replace(hour=0, minute=0, second=0, microsecond=0)
-                                          microsecond=0)
 
 
 def week_start(date):
-  """ 返回 date 这天所在周的开始时间
+    """返回 date 这天所在周的开始时间
 
     Args:
       date: `Datetime` 对象
@@ -73,12 +72,12 @@ def week_start(date):
       返回 date 这天所在周开始时间（周一），`Datetime` 对象
     """
     return timezone.localtime(date) + dateutil.relativedelta.relativedelta(
-    weekday=dateutil.relativedelta.MO(-1), hour=0, minute=0, second=0,
+        weekday=dateutil.relativedelta.MO(-1), hour=0, minute=0, second=0, microsecond=0
-    microsecond=0)
+    )
 
 
 def month_start(d):
-  """ 返回 date 这天所在月的开始时间
+    """返回 date 这天所在月的开始时间
 
     Args:
       date: `Datetime` 对象
@@ -87,7 +86,8 @@ def month_start(d):
       返回 date 这天所在月的开始时间（1号），`Datetime` 对象
     """
     return timezone.localtime(d) + dateutil.relativedelta.relativedelta(
-    day=1, hour=0, minute=0, second=0, microsecond=0)
+        day=1, hour=0, minute=0, second=0, microsecond=0
+    )
 
 
 def month_end(d):
@@ -105,7 +105,7 @@ def month_end(d):
 
 
 def year_start(d):
-  """ 返回 date 这天所在年的开始时间
+    """返回 date 这天所在年的开始时间
 
     Args:
       date: `Datetime` 对象
@@ -114,5 +114,5 @@ def year_start(d):
       返回 date 这天所在年的开始时间（1月 1号），`Datetime` 对象
     """
     return timezone.localtime(d) + dateutil.relativedelta.relativedelta(
-    month=1, day=1, hour=0, minute=0, second=0, microsecond=0)
+        month=1, day=1, hour=0, minute=0, second=0, microsecond=0
-
+    )

utils/const.py

@@ -11,11 +11,7 @@ RECIPE_TYPE_MEAT = 'meat'
 RECIPE_TYPE_VEGETABLE = 'vegetable'
 RECIPE_TYPE_SOUP = 'soup'
 
-RECIPE_TYPE_CHOICE = [
+RECIPE_TYPE_CHOICE = [RECIPE_TYPE_MEAT, RECIPE_TYPE_VEGETABLE, RECIPE_TYPE_SOUP]
-  RECIPE_TYPE_MEAT,
-  RECIPE_TYPE_VEGETABLE,
-  RECIPE_TYPE_SOUP,
-]
 
 FILTER_EXACT = ['exact']
 FILTER_GTE_LTE = ['exact', 'gte', 'gt', 'lte', 'lt']

utils/depoly_notify.py

@@ -2,6 +2,7 @@
 import sys
 import os
 from imp import reload
+
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.append('/Users/ching/develop/dsite')
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "../dsite.settings")
@@ -16,10 +17,5 @@ if __name__ == '__main__':
     repo = git.Repo(search_parent_directories=True)
     commit = repo.head.commit
     rev, branch = commit.name_rev.split(' ')
-    msg = 'rev: %s\n\nauther: %s\n\nbranch: %s\n\nmessage: %s' % (
+    msg = 'rev: %s\n\nauther: %s\n\nbranch: %s\n\nmessage: %s' % (rev, commit.author.name, branch, commit.summary)
-      rev,
-      commit.author.name,
-      branch,
-      commit.summary
-    )
     print(utils.lark.request({'text': msg}))

utils/lark.py

@@ -22,15 +22,16 @@ def gen_sign(timestamp, secret):
 
     return sign
 
+
 def request(content, msg_type=const.LARK_WEBHOOK_MSG_TYPE_TEXT):
-  """ content: {'text': 'xxxxx}
+    """content: {'text': 'xxxxx}"""
-  """
     timestamp = utils.timestamp_of(now())
     data = {
         "timestamp": timestamp,
         "sign": gen_sign(timestamp, settings.LARK_WEBHOOK_SECRET),
         "msg_type": msg_type,
-    "content": content}
+        "content": content,
+    }
     resp = requests.post(settings.LARK_WEBHOOK_URL, data=json.dumps(data))
     if resp.status_code == 200 and resp.json().get('StatusCode') == 0:
         return True