tracdap-runtime 0.9.2.dev1__tar.gz → 0.9.3.dev1__tar.gz

{tracdap_runtime-0.9.2.dev1/tracdap_runtime.egg-info → tracdap_runtime-0.9.3.dev1}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: tracdap-runtime
-Version: 0.9.2.dev1
+Version: 0.9.3.dev1
 Summary: Portable, production-grade models in Python
 Home-page: https://www.fintrac.co.uk/
 Author: Martin Traverse
 Author-email: martin@fintrac.co.uk
 License: Apache-2.0
 Project-URL: Documentation, https://docs.fintrac.co.uk/versions/latest/modelling
-Project-URL: Source Code, https://github.com/martin-traverse/tracdap
-Project-URL: Issue Tracker, https://github.com/martin-traverse/tracdap/issues
+Project-URL: Source Code, https://github.com/finos/tracdap
+Project-URL: Issue Tracker, https://github.com/finos/tracdap/issues
 Platform: any
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -107,7 +107,7 @@ For a complete guide to writing models in the TRAC framework, see the
 
 ## 📦 Requirements
 
-* **Python :**  3.10 or later
+* **Python :**  3.9 or later
 * **Tools :**   Any popular IDE (PyCharm, VS Code, etc.)
 * **Pandas :**  Version 1.2 and later are supported
 * **Polars :**  Version 1.0 and later are supported
@@ -134,35 +134,35 @@ import tracdap.rt.api as trac
 class QuickStartModel(trac.TracModel):
 
     def define_parameters(self):
-        
+
         # Define any parameters the model will use
         return trac.define_parameters(
             trac.P("exchange_rate", trac.FLOAT, "EUR / GBP exchange rate")
         )
 
     def define_inputs(self):
-        
+
         # Define an input table with the columns and data types that the model needs
         customer_loans = trac.define_input_table(
             trac.F("id", trac.STRING, label="Customer account ID", business_key=True),
             trac.F("region", trac.STRING, label="Customer home region", categorical=True),
-            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount"),
+            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount (EUR)"),
             label="Customer loans data")
 
         return {"customer_loans": customer_loans}
 
     def define_outputs(self):
-        
+
         # Define an output table with the columns and data types that the model will produce
         loans_by_region = trac.define_output_table(
             trac.F("region", trac.STRING, label="Customer home region", categorical=True),
-            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount"),
+            trac.F("total_lending", trac.FLOAT, label="Total lending (GBP)"),
             label="Loans by region")
 
         return {"loans_by_region": loans_by_region}
 
     def run_model(self, ctx: trac.TracContext):
-        
+
         # Parameters and inputs are loaded and validated by TRAC
         exchange_rate = ctx.get_parameter("exchange_rate")
         customer_loans = ctx.get_pandas_table("customer_loans")
@@ -171,11 +171,11 @@ class QuickStartModel(trac.TracModel):
         customer_loans["loan_amount_gbp"] = customer_loans["loan_amount"] * exchange_rate
 
         loans_by_region = customer_loans \
-            .groupby("region", as_index=False) \
-            .aggregate({"loan_amount": "sum"})
+            .groupby("region", observed=True, as_index=False) \
+            .aggregate(total_lending=("loan_amount_gbp", "sum"))
 
         # Logs written to ctx.log are captured by the platform
-        ctx.log().info("Aggregated loans for {} regions", len(loans_by_region))
+        ctx.log().info("Aggregated loans for %d regions", len(loans_by_region))
 
         # Outputs are handed back to TRAC for validation and saving
         ctx.put_pandas_table("loans_by_region", loans_by_region)

{tracdap_runtime-0.9.2.dev1 → tracdap_runtime-0.9.3.dev1}/README.md

@@ -45,7 +45,7 @@ For a complete guide to writing models in the TRAC framework, see the
 
 ## 📦 Requirements
 
-* **Python :**  3.10 or later
+* **Python :**  3.9 or later
 * **Tools :**   Any popular IDE (PyCharm, VS Code, etc.)
 * **Pandas :**  Version 1.2 and later are supported
 * **Polars :**  Version 1.0 and later are supported
@@ -72,35 +72,35 @@ import tracdap.rt.api as trac
 class QuickStartModel(trac.TracModel):
 
     def define_parameters(self):
-        
+
         # Define any parameters the model will use
         return trac.define_parameters(
             trac.P("exchange_rate", trac.FLOAT, "EUR / GBP exchange rate")
         )
 
     def define_inputs(self):
-        
+
         # Define an input table with the columns and data types that the model needs
         customer_loans = trac.define_input_table(
             trac.F("id", trac.STRING, label="Customer account ID", business_key=True),
             trac.F("region", trac.STRING, label="Customer home region", categorical=True),
-            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount"),
+            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount (EUR)"),
             label="Customer loans data")
 
         return {"customer_loans": customer_loans}
 
     def define_outputs(self):
-        
+
         # Define an output table with the columns and data types that the model will produce
         loans_by_region = trac.define_output_table(
             trac.F("region", trac.STRING, label="Customer home region", categorical=True),
-            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount"),
+            trac.F("total_lending", trac.FLOAT, label="Total lending (GBP)"),
             label="Loans by region")
 
         return {"loans_by_region": loans_by_region}
 
     def run_model(self, ctx: trac.TracContext):
-        
+
         # Parameters and inputs are loaded and validated by TRAC
         exchange_rate = ctx.get_parameter("exchange_rate")
         customer_loans = ctx.get_pandas_table("customer_loans")
@@ -109,11 +109,11 @@ class QuickStartModel(trac.TracModel):
         customer_loans["loan_amount_gbp"] = customer_loans["loan_amount"] * exchange_rate
 
         loans_by_region = customer_loans \
-            .groupby("region", as_index=False) \
-            .aggregate({"loan_amount": "sum"})
+            .groupby("region", observed=True, as_index=False) \
+            .aggregate(total_lending=("loan_amount_gbp", "sum"))
 
         # Logs written to ctx.log are captured by the platform
-        ctx.log().info("Aggregated loans for {} regions", len(loans_by_region))
+        ctx.log().info("Aggregated loans for %d regions", len(loans_by_region))
 
         # Outputs are handed back to TRAC for validation and saving
         ctx.put_pandas_table("loans_by_region", loans_by_region)

{tracdap_runtime-0.9.2.dev1 → tracdap_runtime-0.9.3.dev1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tracdap-runtime
-version = 0.9.2.dev1
+version = 0.9.3.dev1
 license = Apache-2.0
 platform = any
 description = Portable, production-grade models in Python
@@ -9,8 +9,8 @@ long_description_content_type = text/markdown
 url = https://www.fintrac.co.uk/
 project_urls = 
 	Documentation = https://docs.fintrac.co.uk/versions/latest/modelling
-	Source Code = https://github.com/martin-traverse/tracdap
-	Issue Tracker = https://github.com/martin-traverse/tracdap/issues
+	Source Code = https://github.com/finos/tracdap
+	Issue Tracker = https://github.com/finos/tracdap/issues
 classifiers = 
 	Operating System :: OS Independent
 	Programming Language :: Python :: 3

{tracdap_runtime-0.9.2.dev1 → tracdap_runtime-0.9.3.dev1}/src/tracdap/rt/_version.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "0.9.2.dev1"
+__version__ = "0.9.3.dev1"

{tracdap_runtime-0.9.2.dev1 → tracdap_runtime-0.9.3.dev1/tracdap_runtime.egg-info}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: tracdap-runtime
-Version: 0.9.2.dev1
+Version: 0.9.3.dev1
 Summary: Portable, production-grade models in Python
 Home-page: https://www.fintrac.co.uk/
 Author: Martin Traverse
 Author-email: martin@fintrac.co.uk
 License: Apache-2.0
 Project-URL: Documentation, https://docs.fintrac.co.uk/versions/latest/modelling
-Project-URL: Source Code, https://github.com/martin-traverse/tracdap
-Project-URL: Issue Tracker, https://github.com/martin-traverse/tracdap/issues
+Project-URL: Source Code, https://github.com/finos/tracdap
+Project-URL: Issue Tracker, https://github.com/finos/tracdap/issues
 Platform: any
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -107,7 +107,7 @@ For a complete guide to writing models in the TRAC framework, see the
 
 ## 📦 Requirements
 
-* **Python :**  3.10 or later
+* **Python :**  3.9 or later
 * **Tools :**   Any popular IDE (PyCharm, VS Code, etc.)
 * **Pandas :**  Version 1.2 and later are supported
 * **Polars :**  Version 1.0 and later are supported
@@ -134,35 +134,35 @@ import tracdap.rt.api as trac
 class QuickStartModel(trac.TracModel):
 
     def define_parameters(self):
-        
+
         # Define any parameters the model will use
         return trac.define_parameters(
             trac.P("exchange_rate", trac.FLOAT, "EUR / GBP exchange rate")
         )
 
     def define_inputs(self):
-        
+
         # Define an input table with the columns and data types that the model needs
         customer_loans = trac.define_input_table(
             trac.F("id", trac.STRING, label="Customer account ID", business_key=True),
             trac.F("region", trac.STRING, label="Customer home region", categorical=True),
-            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount"),
+            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount (EUR)"),
             label="Customer loans data")
 
         return {"customer_loans": customer_loans}
 
     def define_outputs(self):
-        
+
         # Define an output table with the columns and data types that the model will produce
         loans_by_region = trac.define_output_table(
             trac.F("region", trac.STRING, label="Customer home region", categorical=True),
-            trac.F("loan_amount", trac.FLOAT, label="Principal loan amount"),
+            trac.F("total_lending", trac.FLOAT, label="Total lending (GBP)"),
             label="Loans by region")
 
         return {"loans_by_region": loans_by_region}
 
     def run_model(self, ctx: trac.TracContext):
-        
+
         # Parameters and inputs are loaded and validated by TRAC
         exchange_rate = ctx.get_parameter("exchange_rate")
         customer_loans = ctx.get_pandas_table("customer_loans")
@@ -171,11 +171,11 @@ class QuickStartModel(trac.TracModel):
         customer_loans["loan_amount_gbp"] = customer_loans["loan_amount"] * exchange_rate
 
         loans_by_region = customer_loans \
-            .groupby("region", as_index=False) \
-            .aggregate({"loan_amount": "sum"})
+            .groupby("region", observed=True, as_index=False) \
+            .aggregate(total_lending=("loan_amount_gbp", "sum"))
 
         # Logs written to ctx.log are captured by the platform
-        ctx.log().info("Aggregated loans for {} regions", len(loans_by_region))
+        ctx.log().info("Aggregated loans for %d regions", len(loans_by_region))
 
         # Outputs are handed back to TRAC for validation and saving
         ctx.put_pandas_table("loans_by_region", loans_by_region)