Merge pull request #14 from swelcker/0.2.5

## 0.2.5 * Switched from local packages to msa* packages * Updated dashboard template, switched to amis version 2.3.0 from 1.10.2 and from local js/css to unpkg.com cdn * BugFix: Solved language issues for the sdk based message popup's
u2d-ai · Oct 4, 2022 · c640a2f · c640a2f
2 parents 5a5c27d + 5b9f306
commit c640a2f
Show file tree

Hide file tree

Showing 239 changed files with 528 additions and 327,106 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,6 @@
 dist/* linguist-documentation
 docs/* linguist-documentation
-docs_dist_site/* linguist-documentation
+dist_docs/* linguist-documentation
 msaSDK/msastatic/* linguist-vendored
 *.html linguist-detectable=false
 *.js linguist-detectable=false

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="http://msa.u2d.ai/images/msa_logo_big.png?raw=true" alt="MSA SDK image"/>
+  <img src="http://logos.u2d.ai/msaSDK_logo.png?raw=true" alt="MSA SDK image"/>
 </p>
 
 ------
@@ -35,14 +35,22 @@
 - **Integrated justpy WEB UI**: Integrated justpy UI Web Framework to MSAAPI, which allows simple adding of routes to justpy webpages functions.
 - **Integrated Dict with Storage Backend**: Use Dict's with backend storage like redis.
 - **Integrated Signals**: Use and handle Signals and Tasks.
+- **Integrated Feature Management**: Feature switch management with conditions.
 
 ## Main Dependencies
 
 - [FastAPI](https://fastapi.tiangolo.com/)
 - [SQLModel](https://sqlmodel.tiangolo.com/)
   combined with  [SQLAlchemy](https://www.sqlalchemy.org/) and [Pydantic](https://pydantic-docs.helpmanual.io/), with all
   their features .
-
+- **msaUtils**: General utils for Microservices based on FastAPI like Profiler, Scheduler, Sysinfo, Healtcheck, Error Handling etc.
+- **msaJustPyUI**: FastAPI adapted JustPy version for Integration of justpy UI Web Framework to msaAppService, which allows simple adding of routes to justpy webpages functions.
+- **msaCRUD**: SQLModel/SQLAlchemy/FastAPI - DB Object CRUD/API Automation
+- **msaFeature**: Feature switch management with conditions
+- **msaServer**: Helper & Wrapper around Uvicorn/Gunicorn for FastAPI based apps
+- **msaSignal**: Signals/Events for Starlette/FastAPI.
+- **msaDocModels**: # MSA Document Pydantic Models and Schemas, used to store Parser, NLP, NLU and AI results for processed documents
+- **msaStorageDict**: Dict with a Storage Backend like redis or Zookeeper
 
 ### Usage example is in the app module \_\_init\_\_.py
 
@@ -155,7 +163,7 @@ if __name__ == '__main__':
 
 ## License Agreement
 
-- `msaSDK`Based on `MIT` open source and free to use, it is free for commercial use, but please clearly show the copyright information about msaSDK - Auth Admin in the display interface.
+- `msaSDK`Based on `MIT` open source and free to use, it is free for commercial use, but please show/list the copyright information about msaSDK somewhere.
 
 
 ## How to create the documentation

diff --git a/docs/css/mkdocstrings.css b/docs/css/mkdocstrings.css
@@ -16,6 +16,13 @@
         content: 'Page ' counter(page);
     }
 }
+/* logo. */
+.md-header__button.md-logo :-webkit-any(img,svg) {
+    fill: currentcolor;
+    display: block;
+    height: 2.2rem;
+    width: auto;
+}
 /* Indentation. */
 div.doc-contents:not(.first) {
   padding-left: 25px;

diff --git a/docs/images/msaSDK_logo.png b/docs/images/msaSDK_logo.png
diff --git a/docs/images/msa_logo_big.png b/docs/images/msa_logo_big.png
diff --git a/docs/index.md b/docs/index.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="http://msa.u2d.ai/images/msa_logo_big.png?raw=true" alt="MSA SDK image"/>
+  <img src="http://logos.u2d.ai/msaSDK_logo.png?raw=true" alt="MSA SDK image"/>
 </p>
 
 ------
@@ -25,20 +25,28 @@
 - **Consistency**: With sometimes 10s or 100s of Micro Services, the SDK helps to easy version control and provides a stable Dapr Basis.
 - **High performance**: Based on [FastAPI](https://fastapi.tiangolo.com/zh/). Enjoy all the benefits.
 - **Integrated Scheduler**: Define Scheduler Tasks with natural language timings and dependencies.
-- **Integrated Dashboard UI**: Admin and Optional Auth enabled Dashboard with CRUD Forms.
+- **Integrated Dashboard UI**: Admin and Optional Auth enabled Dashboard with CRUD Forms based on `fastapi-amis-admin`.
 - **Integrated CRUD**: Generates CRUD Router and Admin Dashboard Forms based on SQLModel and SQLAlchemy.
 - **Integrated Abstract Filesystem**: Agnostic Abstract Filesystem API which allows to use S3, GCS, Azure Datalake, your local FS, Youtube etc.
 - **Integrated justpy WEB UI**: Integrated justpy UI Web Framework to MSAAPI, which allows simple adding of routes to justpy webpages functions.
 - **Integrated Dict with Storage Backend**: Use Dict's with backend storage like redis.
 - **Integrated Signals**: Use and handle Signals and Tasks.
+- **Integrated Feature Management**: Feature switch management with conditions.
 
 ## Main Dependencies
 
 - [FastAPI](https://fastapi.tiangolo.com/)
 - [SQLModel](https://sqlmodel.tiangolo.com/)
   combined with  [SQLAlchemy](https://www.sqlalchemy.org/) and [Pydantic](https://pydantic-docs.helpmanual.io/), with all
   their features .
-
+- **msaUtils**: General utils for Microservices based on FastAPI like Profiler, Scheduler, Sysinfo, Healtcheck, Error Handling etc.
+- **msaJustPyUI**: FastAPI adapted JustPy version for Integration of justpy UI Web Framework to msaAppService, which allows simple adding of routes to justpy webpages functions.
+- **msaCRUD**: SQLModel/SQLAlchemy/FastAPI - DB Object CRUD/API Automation
+- **msaFeature**: Feature switch management with conditions
+- **msaServer**: Helper & Wrapper around Uvicorn/Gunicorn for FastAPI based apps
+- **msaSignal**: Signals/Events for Starlette/FastAPI.
+- **msaDocModels**: # MSA Document Pydantic Models and Schemas, used to store Parser, NLP, NLU and AI results for processed documents
+- **msaStorageDict**: Dict with a Storage Backend like redis or Zookeeper
 
 ### Usage example is in the app module \_\_init\_\_.py
 ```python

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,12 +1,19 @@
 # Release Notes
-## Possible future features:
-* Add examples for Admins Pages and additional features of the Admin and auth module
-* versioning? FastAPI versioning
-* camel case support FastAPI-CamelCase
-* Feature Flags: Own Implementation Boolean, Multivariates, Temporary, Permanent, PaidUsers, ClosedBeta, PercentageOfUsers, Experimental, DefaultFallbackHandler=func, ConditionalFeature
-* Feature Switch with Conditions based on Pydantic Models, switch can have conditions or just on/of and conditions cheack against an existing pydantic or sqlmodel
-* fastapi_socketio?
-* Events lib? FastApi Events or FastAPI Websocket Pub/Sub fastapi-cloudevents? Webhook receive? Seems we need a combination of some
+## Next release:
+* New msaAdmin integration, with Admin, AuthAdmin and new Scheduler which supports Dashboard
+
+## 0.2.5
+* Switched from local packages to msa* packages
+* Updated dashboard template, switched to amis version 2.3.0 from 1.10.2 and from local js/css to unpkg.com cdn
+* BugFix: Solved language issues for the sdk based message popup's
+
+## 0.1.6
+* bug fixed with profiler
+* bug fixed within sdk.js = was wrong version
+* added script folder
+* renamed docs dist folder
+* added docs_src (todo move all sources there)
+* fixed bug in features and deleted mappings as we don't want to define our models twice
 
 ## 0.1.5
 * Cleaned Static Files

diff --git a/docs/saved_req_package_pip_info.pkl b/docs/saved_req_package_pip_info.pkl
diff --git a/docs/sites/admin.md b/docs/sites/admin.md
@@ -88,8 +88,8 @@ class TestCategory(SQLModel, table=True):
 # get the MSA app setting, clear the cache, set some settings
 get_msa_app_settings.cache_clear()
 settings = get_msa_app_settings()
-settings.title = "SPK.ai - MSA/SDK MVP"
-settings.version = "SPK.0.0.1"
+settings.title = "u2d.ai - MSA/SDK MVP"
+settings.version = "MSA.0.0.1"
 settings.debug = True
 
 # Create some timers with a MSATimer instance, define the interval and set the handler

diff --git a/docs/sites/amis.md b/docs/sites/amis.md
@@ -15,7 +15,7 @@ Building a parser that can generate a JSON for a UI seemed pretty straight forwa
 Here an example:
 
 === "UI"
-    ![Smis Schema Example](../images/msa_amis_schema_example.png)
+    ![Amis Schema Example](../images/msa_amis_schema_example.png)
 === "JSON"
     ```python
     {

diff --git a/docs/sites/auth.md b/docs/sites/auth.md
@@ -31,8 +31,8 @@ from msaSDK.service import MSAApp
 # get the MSA app setting, clear the cache, set some settings
 get_msa_app_settings.cache_clear()
 settings = get_msa_app_settings()
-settings.title = "SPK.ai - MSA/SDK MVP"
-settings.version = "SPK.0.0.1"
+settings.title = "u2d.ai - MSA/SDK MVP"
+settings.version = "MSA.0.0.1"
 settings.debug = True
 settings.site_auth = True
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -39,7 +39,7 @@ theme:
         icon: material/brightness-4
         name: Switch to light mode
 
-  logo: '../images/msa_logo_big.png'
+  logo: 'http://logos.u2d.ai/msaSDK_logo.png'
   favicon: '../images/favicon.png'
   features:
     - navigation.tabs
@@ -138,6 +138,11 @@ markdown_extensions:
       alternate_style: true
 
 # extras
+extra:
+  analytics:
+    provider: google
+    property: G-06Q4RT8KC2
+
 extra_css:
   - css/mkdocstrings.css
 

diff --git a/msaSDK/__init__.py b/msaSDK/__init__.py
@@ -10,9 +10,7 @@
 import glob
 from os.path import basename, dirname, isfile, join
 
-import msaSDK.jpui.justpy as justpy
-
-version = "0.1.6"
+version = "0.2.5"
 __author__ = "Stefan Welcker"
 __copyright__ = "Copyright 2022, U2D.ai"
 __license__ = "MIT"

diff --git a/msaSDK/admin/__init__.py b/msaSDK/admin/__init__.py
@@ -30,7 +30,7 @@
         "zh_CN": gettext.translation(
             domain="messages",
             localedir=os.path.join(BASE_DIR, "locale"),
-            languages=["zh_CN"],
+            languages=["en_US"],
         )
     }
 )