cloudintro · cloudintro · Jan 26, 2022 · Jan 2, 2022
diff --git a/article-search/app/src/__init__.py → article-publish/src/__init__.py b/article-search/app/src/__init__.py → article-publish/src/__init__.py
diff --git a/article-search/app/src/config/__init__.py → article-publish/src/main.py b/article-search/app/src/config/__init__.py → article-publish/src/main.py
diff --git a/article-search/app/src/model/__init__.py → article-publish/test/__init__.py b/article-search/app/src/model/__init__.py → article-publish/test/__init__.py
diff --git a/article-search/.gitignore b/article-search/.gitignore
@@ -1,3 +1,130 @@
-.idea
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
 *.iml
 
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
diff --git a/article-search/app/src/service/__init__.py → article-search/__init__.py b/article-search/app/src/service/__init__.py → article-search/__init__.py
diff --git a/article-search/app/.gitignore b/article-search/app/.gitignore
diff --git a/article-search/app/requirements.txt → article-search/requirements.txt b/article-search/app/requirements.txt → article-search/requirements.txt
diff --git a/article-search/app/test/__init__.py → article-search/src/__init__.py b/article-search/app/test/__init__.py → article-search/src/__init__.py
diff --git a/article-search/src/api/__init__.py b/article-search/src/api/__init__.py
diff --git a/article-search/app/src/article_api.py → article-search/src/api/article_api.py b/article-search/app/src/article_api.py → article-search/src/api/article_api.py
@@ -1,8 +1,8 @@
 from fastapi import FastAPI
 from starlette import status
-import service.app_service as app_service
-from model.data_model import ArticleInfo, AppResponse
-from config.es_config import es_obj
+from appservice import app_service
+from appmodel.data_model import ArticleInfo, AppResponse
+from elasticservice.es_config import es_obj
 
 app_v1 = FastAPI()
 

diff --git a/article-search/src/appconfig/__init__.py b/article-search/src/appconfig/__init__.py
diff --git a/article-search/src/appmodel/__init__.py b/article-search/src/appmodel/__init__.py
diff --git a/article-search/app/src/model/data_model.py → article-search/src/appmodel/data_model.py b/article-search/app/src/model/data_model.py → article-search/src/appmodel/data_model.py
diff --git a/article-search/src/appservice/__init__.py b/article-search/src/appservice/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/...cle-search/app/src/service/app_service.py → article-search/src/appservice/app_service.py b/...cle-search/app/src/service/app_service.py → article-search/src/appservice/app_service.py
@@ -1,6 +1,6 @@
-import service.elasticsearch_service as es
-import service.kafka_producer as kfk
-from model.data_model import ArticleInfo
+from elasticservice import es_service as es
+from kafkaservice import kafka_producer as kfk
+from appmodel.data_model import ArticleInfo
 
 
 def save_article_info(article: ArticleInfo):

diff --git a/article-search/src/elasticservice/__init__.py b/article-search/src/elasticservice/__init__.py
diff --git a/article-search/app/src/config/es_config.py → ...le-search/src/elasticservice/es_config.py b/article-search/app/src/config/es_config.py → ...le-search/src/elasticservice/es_config.py
diff --git a/.../app/src/service/elasticsearch_service.py → ...e-search/src/elasticservice/es_service.py b/.../app/src/service/elasticsearch_service.py → ...e-search/src/elasticservice/es_service.py
@@ -1,5 +1,5 @@
 import json
-from config.es_config import es_obj, default_index
+from elasticservice.es_config import es_obj, default_index
 
 
 def add_doc_to_index(document_data, index_name=default_index):

diff --git a/article-search/src/kafkaservice/__init__.py b/article-search/src/kafkaservice/__init__.py
diff --git a/...cle-search/app/src/config/kafka_config.py → ...e-search/src/kafkaservice/kafka_config.py b/...cle-search/app/src/config/kafka_config.py → ...e-search/src/kafkaservice/kafka_config.py
@@ -2,7 +2,7 @@
 from kafka import KafkaConsumer
 import json
 
-bootstrap_servers = ['localhost:9092']
+bootstrap_servers = ['Win11Home.localdomain:9092']
 default_topic = 'python-kafka-topic'
 group_id = 'kafka-group-id'
 
@@ -24,7 +24,8 @@ def init_kafka_consumer(topic_name=default_topic):
     _text_consumer = KafkaConsumer(topic_name, group_id=group_id, bootstrap_servers=bootstrap_servers)
     _consumer = KafkaConsumer(topic_name, group_id=group_id, bootstrap_servers=bootstrap_servers,
                               auto_offset_reset='earliest', enable_auto_commit=True,
-                              value_deserializer=lambda x: json.loads(x.decode('utf-8')))
+                              value_deserializer=lambda x: json.loads(x.decode('utf-8')),
+                              max_poll_interval_ms=1000000)
     print(f"init_kafka_consumer finished")
 
 

diff --git a/...-search/app/src/service/kafka_consumer.py → ...search/src/kafkaservice/kafka_consumer.py b/...-search/app/src/service/kafka_consumer.py → ...search/src/kafkaservice/kafka_consumer.py
@@ -1,5 +1,5 @@
 from kafka.errors import KafkaError
-import config.kafka_config as kfk
+import kafkaservice.kafka_config as kfk
 
 
 def consume_str_message():

diff --git a/...-search/app/src/service/kafka_producer.py → ...search/src/kafkaservice/kafka_producer.py b/...-search/app/src/service/kafka_producer.py → ...search/src/kafkaservice/kafka_producer.py
@@ -1,5 +1,5 @@
 from kafka.errors import KafkaError
-import config.kafka_config as kfk
+from kafkaservice import kafka_config as kfk
 
 
 def on_send_success(record_metadata):

diff --git a/article-search/app/src/main.py → article-search/src/main.py b/article-search/app/src/main.py → article-search/src/main.py
@@ -5,7 +5,7 @@
 import logging
 import uvicorn
 import threading
-from service.kafka_consumer import consume_message
+from kafkaservice.kafka_consumer import consume_message
 
 
 def init_app():
@@ -20,4 +20,4 @@ def init_app():
 if __name__ == "__main__":
     init_app()
     # uvicorn article_api:app --port 8080 --reload
-    uvicorn.run("article_api:app_v1", host="127.0.0.1", port=8080, log_level="info")
+    uvicorn.run("api.article_api:app_v1", host="127.0.0.1", port=8080, log_level="info", reload=True)
diff --git a/article-search/src/redisservice/__init__.py b/article-search/src/redisservice/__init__.py
diff --git a/article-search/test/__init__.py b/article-search/test/__init__.py