cdiscbuilder 1.3.0__tar.gz → 1.3.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (85) hide show
  1. {cdiscbuilder-1.3.0/src/cdiscbuilder.egg-info → cdiscbuilder-1.3.1}/PKG-INFO +1 -1
  2. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/pyproject.toml +1 -1
  3. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/__init__.py +1 -1
  4. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/processor.py +7 -2
  5. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1/src/cdiscbuilder.egg-info}/PKG-INFO +1 -1
  6. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/LICENSE +0 -0
  7. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/MANIFEST.in +0 -0
  8. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/README.md +0 -0
  9. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/setup.cfg +0 -0
  10. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/__init__.py +0 -0
  11. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/__init__.py +0 -0
  12. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/derivations/__init__.py +0 -0
  13. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/derivations/base.py +0 -0
  14. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/derivations/function_derivation.py +0 -0
  15. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py +0 -0
  16. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/engine.py +0 -0
  17. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/functions/__init__.py +0 -0
  18. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/functions/get_bmi.py +0 -0
  19. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/loaders/__init__.py +0 -0
  20. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/loaders/sdtm_loader.py +0 -0
  21. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/tests/test_engine.py +0 -0
  22. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/utils/__init__.py +0 -0
  23. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_derivation/utils/logger.py +0 -0
  24. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/__init__.py +0 -0
  25. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/adam_spec.py +0 -0
  26. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/merge_yaml.py +0 -0
  27. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/schema_validator.py +0 -0
  28. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/__init__.py +0 -0
  29. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/organization/adsl_common.yaml +0 -0
  30. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/project/adsl_project.yaml +0 -0
  31. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/schema.yaml +0 -0
  32. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/study1/adam_study1.yaml +0 -0
  33. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/study1/adsl_study1.yaml +0 -0
  34. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/study1/final_adsl_study1.yaml +0 -0
  35. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/study2/adam_study2.yaml +0 -0
  36. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/study2/adsl_study2.yaml +0 -0
  37. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/data/scenarios/study2/final_adsl_study2.yaml +0 -0
  38. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/test_adam_spec.py +0 -0
  39. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/test_merge_yaml.py +0 -0
  40. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_spec/tests/test_schema_validator.py +0 -0
  41. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_validation/__init__.py +0 -0
  42. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/adam_validation/data_validator.py +0 -0
  43. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/adam/schema.yaml +0 -0
  44. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/cli.py +0 -0
  45. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/__init__.py +0 -0
  46. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/calculate_study_day.py +0 -0
  47. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/coalesce.py +0 -0
  48. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/extract_value.py +0 -0
  49. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/get_bmi.py +0 -0
  50. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/get_dose_dates.py +0 -0
  51. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/get_earliest_informed_consent_date.py +0 -0
  52. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/functions/get_last_participation_date.py +0 -0
  53. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/__init__.py +0 -0
  54. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/__init__.py +0 -0
  55. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/__init__.py +0 -0
  56. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/base.py +0 -0
  57. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/events.py +0 -0
  58. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/findings.py +0 -0
  59. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/general.py +0 -0
  60. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/interventions.py +0 -0
  61. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/classes/special_purpose.py +0 -0
  62. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/config.py +0 -0
  63. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_boundary_standardization.py +0 -0
  64. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_config.py +0 -0
  65. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_findings.py +0 -0
  66. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_general.py +0 -0
  67. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_iso8601.py +0 -0
  68. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_metadata_extractor.py +0 -0
  69. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_processor.py +0 -0
  70. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/tests/test_validate.py +0 -0
  71. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/utils/iso8601.py +0 -0
  72. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/engine/validate.py +0 -0
  73. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/loader/__init__.py +0 -0
  74. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/loader/load.py +0 -0
  75. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/loader/tests/__init__.py +0 -0
  76. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/loader/tests/test_load.py +0 -0
  77. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/odm_parser.py +0 -0
  78. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/sdtm.py +0 -0
  79. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/sdtm/specs/schema.yaml +0 -0
  80. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder/tlf/__init__.py +0 -0
  81. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder.egg-info/SOURCES.txt +0 -0
  82. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder.egg-info/dependency_links.txt +0 -0
  83. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder.egg-info/entry_points.txt +0 -0
  84. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder.egg-info/requires.txt +0 -0
  85. {cdiscbuilder-1.3.0 → cdiscbuilder-1.3.1}/src/cdiscbuilder.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cdiscbuilder
3
- Version: 1.3.0
3
+ Version: 1.3.1
4
4
  Summary: A package to convert ODM XML to SDTM/ADaM Datasets
5
5
  Author-email: Ming-Chun Chen <hellomingchun@gmail.com>
6
6
  Requires-Python: >=3.9
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "cdiscbuilder"
7
- version = "1.3.0"
7
+ version = "1.3.1"
8
8
  description = "A package to convert ODM XML to SDTM/ADaM Datasets"
9
9
  readme = "README.md"
10
10
  authors = [{name = "Ming-Chun Chen", email = "hellomingchun@gmail.com"}]
@@ -1,4 +1,4 @@
1
- __version__ = "1.3.0"
1
+ __version__ = "1.3.1"
2
2
 
3
3
  from . import adam as adam
4
4
  from . import tlf as tlf
@@ -47,6 +47,8 @@ def _build_supp_dataset(domain_name, parent_df, supp_config):
47
47
 
48
48
  resolved_qnam_cols = []
49
49
  qlabel_map = {}
50
+ qorig_map = {}
51
+ qeval_map = {}
50
52
 
51
53
  for qnam, qcfg in supp_columns.items():
52
54
  if isinstance(qcfg, str):
@@ -54,6 +56,9 @@ def _build_supp_dataset(domain_name, parent_df, supp_config):
54
56
 
55
57
  label = qcfg.get("label", qnam)
56
58
  qlabel_map[qnam] = label
59
+
60
+ qorig_map[qnam] = qcfg.get("qorig", qorig)
61
+ qeval_map[qnam] = qcfg.get("qeval", qeval)
57
62
 
58
63
  # Resolve qualifier value
59
64
  if qnam in parent_df.columns:
@@ -103,8 +108,8 @@ def _build_supp_dataset(domain_name, parent_df, supp_config):
103
108
  "QNAM": supp_tall["QNAM"].values,
104
109
  "QLABEL": supp_tall["QNAM"].map(qlabel_map).values,
105
110
  "QVAL": supp_tall["QVAL"].astype(str).values,
106
- "QORIG": qorig,
107
- "QEVAL": qeval,
111
+ "QORIG": supp_tall["QNAM"].map(qorig_map).values,
112
+ "QEVAL": supp_tall["QNAM"].map(qeval_map).values,
108
113
  }
109
114
  )
110
115
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cdiscbuilder
3
- Version: 1.3.0
3
+ Version: 1.3.1
4
4
  Summary: A package to convert ODM XML to SDTM/ADaM Datasets
5
5
  Author-email: Ming-Chun Chen <hellomingchun@gmail.com>
6
6
  Requires-Python: >=3.9
File without changes
File without changes
File without changes
File without changes