Merge pull request #38 from LeukemiaAiResearch/1.0.2

1.0.2 Installation fixes and enhancements
leukaemiamedtech · Oct 11, 2020 · 9482a82 · 9482a82
2 parents 7293593 + d401088
commit 9482a82
Show file tree

Hide file tree

Showing 50 changed files with 2,983 additions and 1,744 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
+# Peter Moss Leukemia AI Research
 ## Contributing to the Hospital Intelligent Automation System project
 
 We encourage bug fixes and enhancements submitted by the community and there are a number of ways you can contribute towards this repository.
@@ -137,7 +137,7 @@ Each .md file in the repository should use the same header. An example of this i
 ![Peter Moss Acute Myeloid & Lymphoblastic Leukemia AI Research Project](Media/Images/Peter-Moss-Acute-Myeloid-Lymphoblastic-Leukemia-Research-Project.png)
 ```
 
-Each .md file in the repository should also use the same footer, with the excpetions of the contributors. If you contribute directly to the code or documentation you should update this area with your details.
+Each .md file in the repository should also use the same footer, with the excpetions of the contributors. If you contribute directly to the code or documentation you should update this area with your details. Below is an example of how the contributing list should be.
 
 ```
 &nbsp;
@@ -150,7 +150,7 @@ Please read the [CONTRIBUTING](CONTRIBUTING.md "CONTRIBUTING") document for a fu
 
 ## Contributors
 
-- [Adam Milton-Barker](https://www.leukemiaresearchassociation.ai/team/adam-milton-barker "Adam Milton-Barker") - [Asociacion De Investigation En Inteligencia Artificial Para La Leucemia Peter Moss](https://www.leukemiaresearchassociation.ai "Asociacion De Investigation En Inteligencia Artificial Para La Leucemia Peter Moss") President & Lead Developer, Sabadell, Spain
+- [Adam Milton-Barker](https://www.leukemiaairesearch.com/team/adam-milton-barker "Adam Milton-Barker") - [Asociacion De Investigation En Inteligencia Artificial Para La Leucemia Peter Moss](https://www.leukemiaairesearch.com "Asociacion De Investigation En Inteligencia Artificial Para La Leucemia Peter Moss") President & Lead Developer, Sabadell, Spain
 
 &nbsp;
 
@@ -177,7 +177,7 @@ The project README contributors should contain a list of all contributors in the
 
 # Push changes to forked repository
 
-![Push changes to forked repository](https://www.leukemiaresearchfoundation.ai/github/media/images/Contributing-Commit-Push.jpg)
+![Push changes to forked repository](https://www.leukemiaairesearch.com/github/media/images/Contributing-Commit-Push.jpg)
 
 When you have made your changes, you need to push them to your forked repository. This process requires a commit with a message about what your commit is, and then finally a push to the repository which will place your changes or created files to your forked repository.
 
@@ -273,7 +273,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at github@leukemiaresearchassociation.ai All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at github@leukemiaairesearch.com All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/Classes/Blockchain.py b/Classes/Blockchain.py
@@ -1,8 +1,7 @@
 ######################################################################################################
 #
-# Organization:  Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
+# Organization:  Peter Moss Leukemia AI Research
 # Repository:    HIAS: Hospital Intelligent Automation System
-# Module:        Blockchain
 #
 # Author:        Adam Milton-Barker (AdamMiltonBarker.com)
 #
@@ -46,9 +45,12 @@ def startBlockchain(self):
 		self.w3 = Web3(Web3.HTTPProvider(self.Helpers.confs["ethereum"]["bchost"], request_kwargs={
 						'auth': HTTPBasicAuth(self.Helpers.confs["ethereum"]["user"], self.Helpers.confs["ethereum"]["pass"])}))
 
-		self.authContract = self.w3.eth.contract(self.Helpers.confs["ethereum"]["authContract"], abi=json.dumps(self.Helpers.confs["ethereum"]["authAbi"]))
-		self.iotContract = self.w3.eth.contract(self.Helpers.confs["ethereum"]["iotContract"], abi=json.dumps(self.Helpers.confs["ethereum"]["iotAbi"]))
-		self.patientsContract = self.w3.eth.contract(self.Helpers.confs["ethereum"]["patientsContract"], abi=json.dumps(self.Helpers.confs["ethereum"]["patientsAbi"]))
+		self.authContract = self.w3.eth.contract(self.w3.toChecksumAddress(
+			self.Helpers.confs["ethereum"]["authContract"]), abi=json.dumps(self.Helpers.confs["ethereum"]["authAbi"]))
+		self.iotContract = self.w3.eth.contract(self.w3.toChecksumAddress(
+			self.Helpers.confs["ethereum"]["iotContract"]), abi=json.dumps(self.Helpers.confs["ethereum"]["iotAbi"]))
+		self.patientsContract = self.w3.eth.contract(self.w3.toChecksumAddress(
+			self.Helpers.confs["ethereum"]["patientsContract"]), abi=json.dumps(self.Helpers.confs["ethereum"]["patientsAbi"]))
 		self.Helpers.logger.info("Blockchain connections started")
 
 	def hiasAccessCheck(self, typeof, identifier):

diff --git a/Classes/Helpers.py b/Classes/Helpers.py
@@ -1,8 +1,7 @@
 ######################################################################################################
 #
-# Organization:  Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
+# Organization:  Peter Moss Leukemia AI Research
 # Repository:    HIAS: Hospital Intelligent Automation System
-# Project:       GeniSysAI
 #
 # Author:        Adam Milton-Barker (AdamMiltonBarker.com)
 # Contributors:

diff --git a/Classes/MongoDB.py b/Classes/MongoDB.py
@@ -1,8 +1,7 @@
 ######################################################################################################
 #
-# Organization:  Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
+# Organization:  Peter Moss Leukemia AI Research
 # Repository:    HIAS: Hospital Intelligent Automation System
-# Module:        MongoDB
 #
 # Author:        Adam Milton-Barker (AdamMiltonBarker.com)
 #

diff --git a/Classes/MySQL.py b/Classes/MySQL.py
@@ -1,8 +1,7 @@
 ######################################################################################################
 #
-# Organization:  Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
+# Organization:  Peter Moss Leukemia AI Research
 # Repository:    HIAS: Hospital Intelligent Automation System
-# Module:        MySQL
 #
 # Author:        Adam Milton-Barker (AdamMiltonBarker.com)
 #

diff --git a/Classes/TassAI.py b/Classes/TassAI.py
@@ -1,8 +1,7 @@
 ######################################################################################################
 #
-# Organization:  Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
-# Repository:   HIAS: Hospital Intelligent Automation System
-# Project:      TassAI
+# Organization:  Peter Moss Leukemia AI Research
+# Repository:    HIAS: Hospital Intelligent Automation System
 #
 # Author:        Adam Milton-Barker (AdamMiltonBarker.com)
 #
@@ -14,7 +13,6 @@
 ######################################################################################################
 
 import cv2
-import dlib
 import os
 import os.path as osp
 

diff --git a/Classes/iotJumpWay.py b/Classes/iotJumpWay.py
@@ -1,8 +1,7 @@
 ######################################################################################################
 #
-# Organization:  Asociacion De Investigacion En Inteligencia Artificial Para La Leucemia Peter Moss
+# Organization:  Peter Moss Leukemia AI Research
 # Repository:    HIAS: Hospital Intelligent Automation System
-# Project:       GeniSysAI
 #
 # Author:        Adam Milton-Barker (AdamMiltonBarker.com)
 # Contributors: