anguage-py">+os.environ.setdefault('DJANGO_SETTINGS_MODULES', 'network_report.settings') 5
+app = Celery('network_report', broker='pyamqp://guest:guest@rabbitmq3//')
6
+app.config_from_object('django.conf:settings', namespace='CELERY')
7
+app.autodiscover_tasks()

+ 12 - 1
app/network_report/settings.py

@@ -24,7 +24,7 @@ env = environ.Env()
24 24
 environ.Env.read_env()
25 25
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
26 26
 BASE_DIR = Path(__file__).resolve().parent.parent
27
-
27
+from celery.schedules import crontab
28 28
 
29 29
 # Quick-start development settings - unsuitable for production
30 30
 # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
@@ -192,3 +192,14 @@ YARN_INSTALLED_APPS = (
192 192
     'tailwind-color-palette', 
193 193
     'paper-css'
194 194
 )
195
+
196
+
197
+CELERY_BEAT_SCHEDULE = {
198
+    "dumpapi": {
199
+        "task": "backend.views.dump_api_task",
200
+        #"schedule": crontab(minute="*/1"),
201
+        # "schedule": crontab(minute="*/30"),
202
+        # "schedule": crontab(hour="17", minute="15"),
203
+        "schedule": crontab(hour="*/3,17-21"),
204
+    },
205
+}

+ 1 - 1
app/worker-entrypoint.sh

@@ -1,3 +1,3 @@
1 1
 #!/bin/bash
2
-celery -A kacee worker -B  -l info
2
+celery -A network_report worker -B  -l info
3 3
 #celery -A kacee beat --detach -l info

+ 24 - 24
docker-compose.prod.yml

@@ -7,7 +7,7 @@ services:
7 7
     ports:
8 8
       - "127.0.0.1:6379:6379"
9 9
   db:
10
-    image: postgres
10
+    image: postgres:15.5-alpine3.19
11 11
     volumes:
12 12
       - ./data/db:/var/lib/postgresql/data
13 13
     ports:
@@ -42,7 +42,7 @@ services:
42 42
   worker:
43 43
     restart: unless-stopped
44 44
     #build: .
45
-    image: tum/web-image
45
+    image: tum/network-report-image
46 46
     #command: python -X dev manage.py  runserver 0.0.0.0:8000
47 47
     entrypoint: ./worker-entrypoint.sh
48 48
     volumes:
@@ -53,34 +53,34 @@ services:
53 53
       - POSTGRES_USER=postgres
54 54
       - POSTGRES_PASSWORD=postgres
55 55
       - PYTHONMALLOC=debug
56
-      - DJANGO_SETTINGS_MODULE=kacee.settings
56
+      - DJANGO_SETTINGS_MODULE=network_report.settings
57 57
       - MODE=${MODE}
58 58
     depends_on:
59 59
       - web
60
-  websocket:
61
-    #build: .
62
-    image: tum/network-report-image
63
-    command: nodemon authentication.py
64
-    volumes:
65
-      - ./app:/code
66
-    ports:
67
-      - "127.0.0.1:8888:8888"
68
-    environment:
69
-      - POSTGRES_NAME=postgres
70
-      - POSTGRES_USER=postgres
71
-      - POSTGRES_PASSWORD=postgres
72
-      - PYTHONMALLOC=debug
73
-      - DJANGO_SETTINGS_MODULE=kacee.settings
74
-      - MODE=${MODE}
75
-    depends_on:
76
-      - db
77
-      - redis
60
+  #websocket:
61
+    ##build: .
62
+    #image: tum/network-report-image
63
+    #command: nodemon authentication.py
64
+    #volumes:
65
+      #- ./app:/code
66
+    #ports:
67
+      #- "127.0.0.1:8888:8888"
68
+    #environment:
69
+      #- POSTGRES_NAME=postgres
70
+      #- POSTGRES_USER=postgres
71
+      #- POSTGRES_PASSWORD=postgres
72
+      #- PYTHONMALLOC=debug
73
+      #- DJANGO_SETTINGS_MODULE=kacee.settings
74
+      #- MODE=${MODE}
75
+    #depends_on:
76
+      #- db
77
+      #- redis
78 78
   rabbitmq:
79 79
     image: rabbitmq:3-management-alpine
80
-    container_name: 'rabbitmq'
80
+    container_name: 'rabbitmq3'
81 81
     ports:
82
-      - "127.0.0.1:5672:5672"
83
-      - "127.0.0.1:15672:15672"
82
+      - "5672:5672"
83
+      - "15672:15672"
84 84
     volumes:
85 85
         - ./rabbitmq/data/:/var/lib/rabbitmq/
86 86
         - ./rabbitmq/log/:/var/log/rabbitmq

+ 29 - 29
docker-compose.yml

@@ -5,7 +5,7 @@ services:
5 5
     ports:
6 6
       - "6379"
7 7
   db:
8
-    image: postgres
8
+    image: postgres:15.5-alpine3.19
9 9
     volumes:
10 10
       - ./data/db:/var/lib/postgresql/data
11 11
     ports:
@@ -17,7 +17,7 @@ services:
17 17
   mongodb:
18 18
     image: mongo:6-jammy
19 19
     ports:
20
-      - '27017'
20
+      - '27017:27017'
21 21
     volumes:
22 22
       - ./mongodb:/data/db
23 23
   web:
@@ -43,24 +43,24 @@ services:
43 43
       - db
44 44
       - redis
45 45
       #- rabbitmq
46
-  #worker:
47
-    #restart: unless-stopped
48
-    ##build: .
49
-    #image: tum/network-report-image
50
-    ##command: python -X dev manage.py  runserver 0.0.0.0:8000
51
-    #entrypoint: ./worker-entrypoint.sh
52
-    #volumes:
53
-      #- ./app:/code
54
-      #- ./media:/code/media
55
-    #environment:
56
-      #- POSTGRES_NAME=postgres
57
-      #- POSTGRES_USER=postgres
58
-      #- POSTGRES_PASSWORD=postgres
59
-      #- PYTHONMALLOC=debug
60
-      #- DJANGO_SETTINGS_MODULE=kacee.settings
61
-      #- MODE=${MODE}
62
-    #depends_on:
63
-      #- web
46
+  worker:
47
+    restart: unless-stopped
48
+    #build: .
49
+    image: tum/network-report-image
50
+    #command: python -X dev manage.py  runserver 0.0.0.0:8000
51
+    entrypoint: ./worker-entrypoint.sh
52
+    volumes:
53
+      - ./app:/code
54
+      - ./media:/code/media
55
+    environment:
56
+      - POSTGRES_NAME=postgres
57
+      - POSTGRES_USER=postgres
58
+      - POSTGRES_PASSWORD=postgres
59
+      - PYTHONMALLOC=debug
60
+      - DJANGO_SETTINGS_MODULE=network_report.settings
61
+      - MODE=${MODE}
62
+    depends_on:
63
+      - web
64 64
   #websocket:
65 65
     ##build: .
66 66
     #image: tum/network-report-image
@@ -79,14 +79,14 @@ services:
79 79
     #depends_on:
80 80
       #- db
81 81
       #- redis
82
-  #rabbitmq:
83
-    #image: rabbitmq:3-management-alpine
84
-    #container_name: 'rabbitmq'
85
-    #ports:
86
-      #- "127.0.0.1:5672:5672"
87
-      #- "127.0.0.1:15672:15672"
88
-    #volumes:
89
-        #- ./rabbitmq/data/:/var/lib/rabbitmq/
90
-        #- ./rabbitmq/log/:/var/log/rabbitmq
82
+  rabbitmq:
83
+    image: rabbitmq:3-management-alpine
84
+    container_name: 'rabbitmq3'
85
+    ports:
86
+      - "5672:5672"
87
+      - "15672:15672"
88
+    volumes:
89
+        - ./rabbitmq/data/:/var/lib/rabbitmq/
90
+        - ./rabbitmq/log/:/var/log/rabbitmq
91 91
     #networks:
92 92
         #- rabbitmq_go_net

Разлика између датотеке није приказан због своје велике величине
+ 5659 - 0
network.ipynb


BIN
ping_test.xlsx


+ 1 - 1
requirements.txt

@@ -38,7 +38,7 @@ django-formset
38 38
 django-multiselectfield
39 39
 django_ace
40 40
 django-autoslug
41
-celery==5.2.7
41
+celery
42 42
 django-phonenumber-field[phonenumbers]
43 43
 django-credit-cards
44 44
 django-payments[stripe]

BIN
table.xlsx


BIN
table1703516489.xlsx


BIN
table2.xlsx


BIN
table3.xlsx


BIN
test.xlsx


BIN
~$table1703516489.xlsx


BIN
~$table3.xlsx


tum/pythonlearning - Gogs: Simplico Git Service

説明なし

favorite_languages.py 357B

12345678910111213
  1. from collections import OrderedDict
  2. favorite_languages = OrderedDict()
  3. favorite_languages['jen'] = 'python'
  4. favorite_languages['sarah'] = 'c'
  5. favorite_languages['edward'] = 'ruby'
  6. favorite_languages['phil'] = 'python'
  7. for name, language in favorite_languages.items():
  8. print(name.title() + "'s favorite language is " +
  9. language.title() + ".")