cherry-pick updates to domain throught the codebase + a fresh db.dist

erikspears · erikspears · commit 611dba856e1a · 2024-08-20T15:07:44.000-04:00
diff --git a/DevUtils/Swirl.postman_collection.json b/DevUtils/Swirl.postman_collection.json
@@ -21,7 +21,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n        \"name\": \"Swirl Documentation TEST - Google PSE\",\n        \"active\": false,\n        \"default\": true,\n        \"authenticator\": \"\",\n        \"connector\": \"RequestsGet\",\n        \"url\": \"https://www.googleapis.com/customsearch/v1\",\n        \"query_template\": \"{url}?cx={cx}&key={key}&q={query_string}\",\n        \"post_query_template\": {},\n        \"http_request_headers\": {},\n        \"page_fetch_config_json\": {\n            \"cache\": \"false\",\n            \"headers\": {\n                \"User-Agent\": \"Swirlbot/1.0 (+http://swirl.today)\"\n            },\n            \"timeout\": 10\n        },\n        \"query_processors\": [\n            \"AdaptiveQueryProcessor\"\n        ],\n        \"query_mappings\": \"cx=f047885d9696f447c,DATE_SORT=sort=date,PAGE=start=RESULT_INDEX,NOT_CHAR=-\",\n        \"result_grouping_field\": \"\",\n        \"result_processors\": [\n            \"MappingResultProcessor\",\n            \"DateFinderResultProcessor\",\n            \"CosineRelevancyResultProcessor\"\n        ],\n        \"response_mappings\": \"FOUND=searchInformation.totalResults,RETRIEVED=queries.request[0].count,RESULTS=items\",\n        \"result_mappings\": \"title=title,url=link,body=snippet,author=displayLink,cacheId,pagemap.metatags[*].['og:type'],pagemap.metatags[*].['og:site_name'],pagemap.metatags[*].['og:description'],NO_PAYLOAD\",\n        \"results_per_query\": 10,\n        \"credentials\": \"key=AIzaSyDvVeE-L6nCC9u-TTGuhggvSmzhtiTHJsA\",\n        \"eval_credentials\": \"\",\n        \"tags\": [\n            \"Swirl\",\n            \"Documentation\"\n        ]\n    }"
+					"raw": "{\n        \"name\": \"Swirl Documentation TEST - Google PSE\",\n        \"active\": false,\n        \"default\": true,\n        \"authenticator\": \"\",\n        \"connector\": \"RequestsGet\",\n        \"url\": \"https://www.googleapis.com/customsearch/v1\",\n        \"query_template\": \"{url}?cx={cx}&key={key}&q={query_string}\",\n        \"post_query_template\": {},\n        \"http_request_headers\": {},\n        \"page_fetch_config_json\": {\n            \"cache\": \"false\",\n            \"headers\": {\n                \"User-Agent\": \"Swirlbot/1.0 (+http://swirlaiconnect.com)\"\n            },\n            \"timeout\": 10\n        },\n        \"query_processors\": [\n            \"AdaptiveQueryProcessor\"\n        ],\n        \"query_mappings\": \"cx=f047885d9696f447c,DATE_SORT=sort=date,PAGE=start=RESULT_INDEX,NOT_CHAR=-\",\n        \"result_grouping_field\": \"\",\n        \"result_processors\": [\n            \"MappingResultProcessor\",\n            \"DateFinderResultProcessor\",\n            \"CosineRelevancyResultProcessor\"\n        ],\n        \"response_mappings\": \"FOUND=searchInformation.totalResults,RETRIEVED=queries.request[0].count,RESULTS=items\",\n        \"result_mappings\": \"title=title,url=link,body=snippet,author=displayLink,cacheId,pagemap.metatags[*].['og:type'],pagemap.metatags[*].['og:site_name'],pagemap.metatags[*].['og:description'],NO_PAYLOAD\",\n        \"results_per_query\": 10,\n        \"credentials\": \"key=AIzaSyDvVeE-L6nCC9u-TTGuhggvSmzhtiTHJsA\",\n        \"eval_credentials\": \"\",\n        \"tags\": [\n            \"Swirl\",\n            \"Documentation\"\n        ]\n    }"
 				},
 				"url": {
 					"raw": "{{baseUrl}}swirl/searchproviders/",
diff --git a/SearchProviders/europe_pmc.json b/SearchProviders/europe_pmc.json
@@ -10,7 +10,7 @@
     "page_fetch_config_json": {
         "cache": "false",
         "headers": {
-            "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+            "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
         },
         "timeout": 10
 },
diff --git a/SearchProviders/google.json b/SearchProviders/google.json
@@ -11,7 +11,7 @@
         "page_fetch_config_json": {
             "cache": "false",
             "headers": {
-                "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+                "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
             },
             "www.businesswire.com": {
                 "timeout": 60
@@ -106,7 +106,7 @@
         ]
     },
     {
-        "name": "Swirl Documentation - docs.swirl.today",
+        "name": "Swirl Documentation - docs.swirlaiconnect.com",
         "active": true,
         "default": true,
         "connector": "RequestsGet",
@@ -117,7 +117,7 @@
         "page_fetch_config_json": {
             "cache": "false",
             "headers": {
-                "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+                "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
             },
             "www.businesswire.com": {
                 "timeout": 60
diff --git a/SearchProviders/preloaded.json b/SearchProviders/preloaded.json
@@ -11,7 +11,7 @@
         "page_fetch_config_json": {
             "cache": "false",
             "headers": {
-                "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+                "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
             },
             "www.businesswire.com": {
                 "timeout": 60
@@ -109,7 +109,7 @@
         ]
     },
     {
-        "name": "Swirl Documentation - docs.swirl.today",
+        "name": "Swirl Documentation - docs.swirlaiconnect.com",
         "active": true,
         "default": true,
         "connector": "RequestsGet",
@@ -120,7 +120,7 @@
         "page_fetch_config_json": {
             "cache": "false",
             "headers": {
-                "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+                "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
             },
             "www.businesswire.com": {
                 "timeout": 60
@@ -200,7 +200,7 @@
         "page_fetch_config_json": {
             "cache": "false",
             "headers": {
-                "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+                "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
             },
             "timeout": 10
         },
diff --git a/db.sqlite3.dist b/db.sqlite3.dist
diff --git a/install-ui.sh b/install-ui.sh
@@ -46,7 +46,7 @@ where_jq=`which jq`
 if [ $? -eq 0 ]; then
     echo $PROG "Found jq command in ${where_jq}"
 else
-    echo $PROG "Could not find jq command on your path, please consult the admin guide at https://docs.swirl.today/Admin-Guide#installation."
+    echo $PROG "Could not find jq command on your path, please consult the Installation Guide at https://docs.swirlaiconnect.com/Installation-Community.html."
     exit 1
 fi
 
diff --git a/swirl.py b/swirl.py
@@ -146,7 +146,7 @@ def start(service_list):
     if not is_running_celery_redis():
            print(f"Error: Celery requires redis, settings.CELERY_BROKER_URL:{settings.CELERY_BROKER_URL}\n"
                  f"settings.CELERY_RESULT_BACKEND:{settings.CELERY_RESULT_BACKEND} but it does not appear to be running,\n"
-                 "please consult the admin guide at https://docs.swirl.today/Admin-Guide#installation.")
+                 "please consult the admin guide at https://docs.swirlaiconnect.com/Admin-Guide.html.")
            return False
 
     # start service_list
diff --git a/swirl/connectors/postgresql.py b/swirl/connectors/postgresql.py
@@ -21,7 +21,7 @@
 try:
     import psycopg2
 except ImportError as e:
-    logger.error(f"postgresql.py: Error: can't load psycopg2: {e}, see https://docs.swirl.today/Developer-Reference.html#postgresql")
+    logger.error(f"postgresql.py: Error: can't load psycopg2: {e}, see https://docs.swirlaiconnect.com/Developer-Reference.html#postgresql")
 
 from swirl.connectors.db_connector import DBConnector
 
diff --git a/swirl/tasks.py b/swirl/tasks.py
@@ -36,7 +36,7 @@
 DEV_FETCH_OPTIONS = {
     "cache": "false",
     "headers": {
-        "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"
+        "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"
     },
     "timeout": 10
 }
diff --git a/swirl/templates/rest_framework/api.html b/swirl/templates/rest_framework/api.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block branding %}
-    <a class="navbar-brand" rel="nofollow" href="http://swirl.today/">
+    <a class="navbar-brand" rel="nofollow" href="https://swirlaiconnect.com/">
         {% trans 'Swirl' %}
     </a>
 {% endblock %}
diff --git a/swirl/tests/test_web_page.py b/swirl/tests/test_web_page.py
@@ -77,7 +77,7 @@ def test_page_fetch_factory_options_1(self):
         self.assert_page_fetch_default_options(pf, do_cache=False)
 
         ## set values in the headers
-        test_user_agent = 'Testbot/1.0 (+http://swirl.today)'
+        test_user_agent = 'Testbot/1.0 (+http://swirlaiconnect.com)'
         test_header_val = "bar-value"
         pf = PageFetcherFactory.alloc_page_fetcher(url=test_url,
                                                    options= {
@@ -115,7 +115,7 @@ def test_page_fetch_factory_options_1(self):
 
         ## set all
         test_timeout = 22
-        test_user_agent = 'Testbot/1.0 (+http://swirl.today)'
+        test_user_agent = 'Testbot/1.0 (+http://swirlaiconnect.com)'
         test_header_val = 'bar-value'
         pf = PageFetcherFactory.alloc_page_fetcher(url=test_url,
                                                    options= {
diff --git a/swirl/utils.py b/swirl/utils.py
@@ -22,8 +22,8 @@
 import logging
 logger = logging.getLogger(__name__)
 
-SWIRL_MACHINE_AGENT   = {'User-Agent': 'SwirlMachineServer/1.0 (+http://swirl.today)'}
-SWIRL_CONTAINER_AGENT = {'User-Agent': 'SwirlContainer/1.0 (+http://swirl.today)'}
+SWIRL_MACHINE_AGENT   = {'User-Agent': 'SwirlMachineServer/1.0 (+http://swirlaiconnect.com)'}
+SWIRL_CONTAINER_AGENT = {'User-Agent': 'SwirlContainer/1.0 (+http://swirlaiconnect.com)'}
 
 
 ##################################################
diff --git a/swirl/web_page.py b/swirl/web_page.py
@@ -215,7 +215,7 @@ def __init__(self, options={},url=""):
     @staticmethod
     def get_page_fetch_defaults():
         return  {
-            "headers":{'User-Agent': 'Swirlbot/1.0 (+http://swirl.today)'},
+            "headers":{'User-Agent': 'Swirlbot/1.0 (+http://swirlaiconnect.com)'},
             "timeout": WEB_PAGE_FETCHER_DEFAULT_TIMEOUT_SECONDS,
         }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`DEV_FETCH_OPTIONS = {`
`37`	`37`	`"cache": "false",`
`38`	`38`	`"headers": {`
`39`		`- "User-Agent": "Swirlbot/1.0 (+http://swirl.today)"`
	`39`	`+ "User-Agent": "Swirlbot/1.0 (+http://swirlaiconnect.com)"`
`40`	`40`	`},`
`41`	`41`	`"timeout": 10`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ def __init__(self, options={},url=""):`
`215`	`215`	`@staticmethod`
`216`	`216`	`def get_page_fetch_defaults():`
`217`	`217`	`return {`
`218`		`- "headers":{'User-Agent': 'Swirlbot/1.0 (+http://swirl.today)'},`
	`218`	`+ "headers":{'User-Agent': 'Swirlbot/1.0 (+http://swirlaiconnect.com)'},`
`219`	`219`	`"timeout": WEB_PAGE_FETCHER_DEFAULT_TIMEOUT_SECONDS,`
`220`	`220`	`}`
`221`	`221`